[Libreoffice-commits] .: 7 commits - cui/source desktop/source filter/inc filter/qa filter/source helpcompiler/source Makefile.top sc/source sd/source sot/inc sot/Package_inc.mk sot/source starmath/inc starmath/qa svtools/qa sw/qa tools/inc tools/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 14 02:12:44 PST 2012
Makefile.top | 1
cui/source/customize/selector.cxx | 43 ---
cui/source/dialogs/scriptdlg.cxx | 34 --
cui/source/inc/scriptdlg.hxx | 3
cui/source/inc/selector.hxx | 9
desktop/source/deployment/gui/descedit.cxx | 23 -
desktop/source/deployment/gui/descedit.hxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 16 -
filter/inc/filter/msfilter/dffpropset.hxx | 1
filter/inc/filter/msfilter/msdffimp.hxx | 2
filter/qa/cppunit/data/tiff/fail/EBD-22681-1.tiff |binary
filter/source/msfilter/dffpropset.cxx | 7
filter/source/msfilter/msdffimp.cxx | 9
helpcompiler/source/HelpIndexer_main.cxx | 4
sc/source/ui/inc/docsh.hxx | 6
sc/source/ui/inc/servobj.hxx | 3
sc/source/ui/vba/vbaformat.cxx | 20 -
sc/source/ui/vba/vbaformat.hxx | 1
sd/source/ui/func/fuprlout.cxx | 5
sd/source/ui/view/drviews3.cxx | 7
sd/source/ui/view/drviews9.cxx | 10
sd/source/ui/view/sdview.cxx | 5
sd/source/ui/view/sdview2.cxx | 9
sd/source/ui/view/viewshel.cxx | 5
sot/Package_inc.mk | 1
sot/inc/sot/factory.hxx | 1
sot/inc/sot/object.hxx | 9
sot/inc/sot/sotref.hxx | 63 ----
sot/inc/sot/stg.hxx | 7
sot/inc/sot/storage.hxx | 21 -
sot/source/base/factory.cxx | 29 --
sot/source/base/object.cxx | 38 --
sot/source/sdstor/storage.cxx | 123 --------
sot/source/sdstor/ucbstorage.cxx | 98 -------
starmath/inc/document.hxx | 1
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 4
starmath/qa/cppunit/test_starmath.cxx | 4
svtools/qa/cppunit/data/bmp/indeterminate/.gitignore | 1
svtools/qa/cppunit/data/bmp/pass/CVE-2004-0691-1.bmp |binary
svtools/qa/cppunit/data/bmp/pass/CVE-2006-0006-1.bmp |binary
svtools/qa/cppunit/data/bmp/pass/CVE-2007-2244-1.bmp |binary
svtools/qa/cppunit/data/bmp/pass/CVE-2008-5870-1.bmp | 1
svtools/qa/cppunit/data/bmp/pass/EDB-22680-1.bmp |binary
svtools/qa/cppunit/filters-test.cxx | 4
sw/qa/core/filters-test.cxx | 4
sw/qa/core/macros-test.cxx | 4
sw/qa/core/swdoc-test.cxx | 4
tools/inc/tools/inetmime.hxx | 13
tools/inc/tools/poly.hxx | 2
tools/source/generic/poly2.cxx | 10
tools/source/inet/inetmime.cxx | 265 -------------------
unotools/inc/unotools/ucblockbytes.hxx | 9
unotools/source/ucbhelper/ucblockbytes.cxx | 46 ---
unusedcode.easy | 37 ++
vcl/inc/vcl/graph.hxx | 2
vcl/source/gdi/graph.cxx | 8
56 files changed, 65 insertions(+), 969 deletions(-)
New commits:
commit 690ce9f1b95c0bb2e8401771c376d3052009c9af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 14 09:27:04 2012 +0000
callcatcher: more binfilter freed up methods
Change-Id: Iea3716e5c7a21f083f36ce4b8d43ae9fc85227f7
diff --git a/Makefile.top b/Makefile.top
index 82ce7f8..af7d91d 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -531,6 +531,7 @@ findunusedcode:
| grep -v ^libwps_tools_win:: \
| grep -v ^lucene:: \
| grep -v ^Matrix3d:: \
+ | grep -v ^RelatedMultipart:: \
| grep -v ^salhelper:: \
| grep -v ^VSDInternalStream:: \
| grep -v ^WP1 \
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 6e75116..904adf3 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -55,21 +55,6 @@ void DescriptionEdit::Init()
// -----------------------------------------------------------------------
-void DescriptionEdit::UpdateScrollBar()
-{
- if ( m_bIsVerticalScrollBarHidden )
- {
- ScrollBar* pVScrBar = GetVScrollBar();
- if ( pVScrBar && pVScrBar->GetVisibleSize() < pVScrBar->GetRangeMax() )
- {
- pVScrBar->Show();
- m_bIsVerticalScrollBarHidden = false;
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
void DescriptionEdit::Clear()
{
SetText( String() );
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index 7c8eb3e..a7a7b0c 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -33,7 +33,6 @@ namespace dp_gui
bool m_bIsVerticalScrollBarHidden;
void Init();
- void UpdateScrollBar();
public:
DescriptionEdit( Window* pParent, const ResId& rResId );
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 183ffaa..711dce2 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -267,11 +267,8 @@ public:
const SvStream* GetSvStream() const;
virtual sal_Bool Equals( const BaseStorageStream& rStream ) const;
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
SvStream* GetModifySvStream();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const;
};
namespace ucbhelper
@@ -355,20 +352,16 @@ public:
virtual const SvStream* GetSvStream() const;
virtual sal_Bool Equals( const BaseStorage& rStream ) const;
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
-//#if _SOLAR__PRIVATE
UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const;
sal_Bool CopyStorageElement_Impl( UCBStorageElement_Impl& rElement,
BaseStorage* pDest, const String& rNew ) const;
BaseStorage* OpenStorage_Impl( const String & rEleName,
StreamMode, sal_Bool bDirect, sal_Bool bForceUCBStorage );
-//#endif
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index abe1d83..2f92517 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -197,7 +197,6 @@ public:
virtual sal_Bool MoveTo( const String & rEleName, SotStorage * pDest,
const String & rNewName );
- sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
sal_Bool IsOLEStorage() const;
static sal_Bool IsOLEStorage( const String & rFileName );
static sal_Bool IsOLEStorage( SvStream* pStream );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 5fd1efa..dbfeefc 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -1047,20 +1047,6 @@ sal_Bool SotStorage::Validate()
return sal_True;
}
-sal_Bool SotStorage::SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue )
-{
- UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
- if ( pStg )
- {
- return pStg->SetProperty( rName, rValue );
- }
- else
- {
- DBG_WARNING("W1:Not implemented!");
- return sal_False;
- }
-}
-
sal_Bool SotStorage::IsOLEStorage() const
{
UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index c3158c5..c0a0021 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -453,9 +453,6 @@ public:
sal_uLong CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
// but the writing is done at the end of temporary
// pointer position is not changed
- Reference<XInputStream> GetXInputStream(); // return XInputStream, after that
- // this class is close to be unusable
- // since it can not read and write
using SvStream::SetError;
void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
@@ -710,62 +707,6 @@ UCBStorageStream_Impl::~UCBStorageStream_Impl()
}
-Reference<XInputStream> UCBStorageStream_Impl::GetXInputStream()
-{
- Reference< XInputStream > aResult;
-
- if( m_pAntiImpl && m_nRepresentMode != nonset )
- {
- OSL_FAIL( "Misuse of the XInputstream!" );
- SetError( ERRCODE_IO_ACCESSDENIED );
- }
- else
- {
- if( m_bModified )
- {
- // use wrapper around temporary stream
- if( Init() )
- {
- CopySourceToTemporary();
-
- // owner transfer of stream to wrapper
- aResult = new ::utl::OInputStreamWrapper( m_pStream, sal_True );
- m_pStream->Seek(0);
-
- if( aResult.is() )
- {
- // temporary stream can not be used here any more
- // and can not be opened untill wrapper is closed
- // stream is deleted by wrapper after use
- m_pStream = NULL;
- m_nRepresentMode = xinputstream;
- }
- }
- }
- else
- {
- Free();
-
- // open a new instance of XInputStream
- try
- {
- aResult = m_pContent->openStream();
- }
- catch (const Exception&)
- {
- // usually means that stream could not be opened
- }
-
- if( aResult.is() )
- m_nRepresentMode = xinputstream;
- else
- SetError( ERRCODE_IO_ACCESSDENIED );
- }
- }
-
- return aResult;
-}
-
sal_Bool UCBStorageStream_Impl::Init()
{
if( m_nRepresentMode == xinputstream )
@@ -1420,11 +1361,6 @@ SvStream* UCBStorageStream::GetModifySvStream()
return (SvStream*)pImp;
}
-Reference< XInputStream > UCBStorageStream::GetXInputStream() const
-{
- return pImp->GetXInputStream();
-}
-
sal_Bool UCBStorageStream::Equals( const BaseStorageStream& rStream ) const
{
// ???
@@ -1508,23 +1444,6 @@ sal_Bool UCBStorageStream::SetProperty( const String& rName, const ::com::sun::s
return sal_False;
}
-sal_Bool UCBStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- try
- {
- if ( pImp->m_pContent )
- {
- rValue = pImp->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
-
- return sal_False;
-}
-
sal_uLong UCBStorageStream::GetSize() const
{
return pImp->GetSize();
@@ -3361,21 +3280,4 @@ sal_Bool UCBStorage::SetProperty( const String& rName, const ::com::sun::star::u
return sal_False;
}
-sal_Bool UCBStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- try
- {
- if ( pImp->GetContent() )
- {
- rValue = pImp->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
-
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 2e0e483..296a08e 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -420,11 +420,6 @@ public:
static const sal_Unicode * skipComment(const sal_Unicode * pBegin,
const sal_Unicode * pEnd);
- static const sal_Char * skipLinearWhiteSpaceComment(const sal_Char *
- pBegin,
- const sal_Char *
- pEnd);
-
static const sal_Unicode * skipLinearWhiteSpaceComment(const sal_Unicode *
pBegin,
const sal_Unicode *
@@ -438,9 +433,6 @@ public:
static const sal_Unicode * skipQuotedString(const sal_Unicode * pBegin,
const sal_Unicode * pEnd);
- static bool scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd,
- bool bLeadingZeroes, sal_uInt32 & rValue);
-
static bool scanUnsigned(const sal_Unicode *& rBegin,
const sal_Unicode * pEnd, bool bLeadingZeroes,
sal_uInt32 & rValue);
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 2def17c..834583e 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -575,44 +575,6 @@ const sal_Unicode * INetMIME::skipComment(const sal_Unicode * pBegin,
}
// static
-const sal_Char * INetMIME::skipLinearWhiteSpaceComment(const sal_Char *
- pBegin,
- const sal_Char * pEnd)
-{
- DBG_ASSERT(pBegin && pBegin <= pEnd,
- "INetMIME::skipLinearWhiteSpaceComment(): Bad sequence");
-
- while (pBegin != pEnd)
- switch (*pBegin)
- {
- case '\t':
- case ' ':
- ++pBegin;
- break;
-
- case 0x0D: // CR
- if (startsWithLineFolding(pBegin, pEnd))
- pBegin += 3;
- else
- return pBegin;
- break;
-
- case '(':
- {
- const sal_Char * p = skipComment(pBegin, pEnd);
- if (p == pBegin)
- return pBegin;
- pBegin = p;
- break;
- }
-
- default:
- return pBegin;
- }
- return pBegin;
-}
-
-// static
const sal_Unicode * INetMIME::skipLinearWhiteSpaceComment(const sal_Unicode *
pBegin,
const sal_Unicode *
@@ -708,28 +670,6 @@ const sal_Unicode * INetMIME::skipQuotedString(const sal_Unicode * pBegin,
}
// static
-bool INetMIME::scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd,
- bool bLeadingZeroes, sal_uInt32 & rValue)
-{
- sal_uInt64 nTheValue = 0;
- const sal_Char * p = rBegin;
- for ( ; p != pEnd; ++p)
- {
- int nWeight = getWeight(*p);
- if (nWeight < 0)
- break;
- nTheValue = 10 * nTheValue + nWeight;
- if (nTheValue > std::numeric_limits< sal_uInt32 >::max())
- return false;
- }
- if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1)))
- return false;
- rBegin = p;
- rValue = sal_uInt32(nTheValue);
- return true;
-}
-
-// static
bool INetMIME::scanUnsigned(const sal_Unicode *& rBegin,
const sal_Unicode * pEnd, bool bLeadingZeroes,
sal_uInt32 & rValue)
diff --git a/unusedcode.easy b/unusedcode.easy
index cd2ce8c..55a29ae 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,7 +4,6 @@ GraphicObject::SwapIn(SvStream*)
LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
-RelatedMultipart::getIds()
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
@@ -70,6 +69,11 @@ svgio::svgreader::SvgStyleAttributes::setFillRule(bool const*)
svgio::svgreader::pathTextBreakupHelper::getLength(rtl::OUString const&) const
test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
test::BootstrapFixtureBase::getURLFromWorkdir(char const*)
+unicode::isAlphaDigit(unsigned short)
+unicode::isDigit(unsigned short)
+unicode::isLower(unsigned short)
+unicode::isPrint(unsigned short)
+unicode::isUpper(unsigned short)
writerfilter::analyzerIds()
writerfilter::createAnalyzer()
writerfilter::createStreamHandler()
commit fb0b27491dbb0186ac20574b47c904b4c44eac83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 14 00:40:57 2012 +0000
loplugin: unused std::strings
Change-Id: I1b1bbed72cf3e54115ce1a10c31f80eb8e3bea28
diff --git a/helpcompiler/source/HelpIndexer_main.cxx b/helpcompiler/source/HelpIndexer_main.cxx
index 3fe0402..e5ff2aa 100644
--- a/helpcompiler/source/HelpIndexer_main.cxx
+++ b/helpcompiler/source/HelpIndexer_main.cxx
@@ -79,10 +79,6 @@ int main(int argc, char **argv) {
return 1;
}
- std::string captionDir(dir + SAL_PATHDELIMITER + "caption");
- std::string contentDir(dir + SAL_PATHDELIMITER + "content");
- std::string indexDir(dir + SAL_PATHDELIMITER + module + ".idxl");
-
rtl::OUString sDir;
osl::File::getFileURLFromSystemPath(
commit a0b51cd8d415a2eab36671e9dba0f42c4a98d943
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 14 00:04:10 2012 +0000
add regression tests for .bmps/.rles including EDB-22680
Change-Id: If351421b9de11870bb81010626377db8585a1edd
diff --git a/svtools/qa/cppunit/data/bmp/fail/.gitignore b/svtools/qa/cppunit/data/bmp/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/bmp/indeterminate/.gitignore b/svtools/qa/cppunit/data/bmp/indeterminate/.gitignore
new file mode 100644
index 0000000..583b009
--- /dev/null
+++ b/svtools/qa/cppunit/data/bmp/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/svtools/qa/cppunit/data/bmp/pass/.gitignore b/svtools/qa/cppunit/data/bmp/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/bmp/pass/CVE-2004-0691-1.bmp b/svtools/qa/cppunit/data/bmp/pass/CVE-2004-0691-1.bmp
new file mode 100644
index 0000000..d77db57
Binary files /dev/null and b/svtools/qa/cppunit/data/bmp/pass/CVE-2004-0691-1.bmp differ
diff --git a/svtools/qa/cppunit/data/bmp/pass/CVE-2006-0006-1.bmp b/svtools/qa/cppunit/data/bmp/pass/CVE-2006-0006-1.bmp
new file mode 100644
index 0000000..4cfbdff
Binary files /dev/null and b/svtools/qa/cppunit/data/bmp/pass/CVE-2006-0006-1.bmp differ
diff --git a/svtools/qa/cppunit/data/bmp/pass/CVE-2007-2244-1.bmp b/svtools/qa/cppunit/data/bmp/pass/CVE-2007-2244-1.bmp
new file mode 100644
index 0000000..289cf8c
Binary files /dev/null and b/svtools/qa/cppunit/data/bmp/pass/CVE-2007-2244-1.bmp differ
diff --git a/svtools/qa/cppunit/data/bmp/pass/CVE-2008-5870-1.bmp b/svtools/qa/cppunit/data/bmp/pass/CVE-2008-5870-1.bmp
new file mode 100644
index 0000000..d223dde
--- /dev/null
+++ b/svtools/qa/cppunit/data/bmp/pass/CVE-2008-5870-1.bmp
@@ -0,0 +1 @@
+ î¬.Gx© ŠKØ'seë2Ï~°Œè.G1Ì-”è‚#á›ø1 †Y!ðÜÊ¢/ÙDVñ
\ No newline at end of file
diff --git a/svtools/qa/cppunit/data/bmp/pass/EDB-22680-1.bmp b/svtools/qa/cppunit/data/bmp/pass/EDB-22680-1.bmp
new file mode 100644
index 0000000..88b11ad
Binary files /dev/null and b/svtools/qa/cppunit/data/bmp/pass/EDB-22680-1.bmp differ
diff --git a/svtools/qa/cppunit/filters-test.cxx b/svtools/qa/cppunit/filters-test.cxx
index a9b5afd..bdf8269 100644
--- a/svtools/qa/cppunit/filters-test.cxx
+++ b/svtools/qa/cppunit/filters-test.cxx
@@ -95,6 +95,10 @@ void SvtoolsFiltersTest::testCVEs()
testDir(rtl::OUString(),
getURLFromSrc("/svtools/qa/cppunit/data/gif/"),
rtl::OUString());
+
+ testDir(rtl::OUString(),
+ getURLFromSrc("/svtools/qa/cppunit/data/bmp/"),
+ rtl::OUString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest);
commit 69984a278565506525a9f306355deca5c7acbf1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 13 23:25:36 2012 +0000
add a regression test for EDB-22681
Change-Id: I62adf5eef023de163114266de56c14310f3aad34
diff --git a/filter/qa/cppunit/data/tiff/fail/EBD-22681-1.tiff b/filter/qa/cppunit/data/tiff/fail/EBD-22681-1.tiff
new file mode 100644
index 0000000..614051d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/EBD-22681-1.tiff differ
commit 7768cbe901d7f7af85c74ff506eb442b2205e5fa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 13 23:21:10 2012 +0000
callcatcher: neither setNumberFormat is used
Change-Id: I782eace543ae5618004c61b9b84a0646cc463df6
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 5688021..e46bb92 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -401,26 +401,6 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException,
}
template< typename Ifc1 >
-void
-ScVbaFormat<Ifc1>::setNumberFormat( lang::Locale _aLocale, const rtl::OUString& _sFormatString) throw( script::BasicErrorException )
-{
- try
- {
- initializeNumberFormats();
- sal_Int32 nFormat = xNumberFormats->queryKey(_sFormatString, _aLocale , sal_True);
- if (nFormat == -1)
- {
- xNumberFormats->addNew(_sFormatString, _aLocale);
- }
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nFormat ) );
- }
- catch (const uno::Exception& )
- {
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
-}
-
-template< typename Ifc1 >
void SAL_CALL
ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index f552011..861bc87 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -62,7 +62,6 @@ protected:
bool isAmbiguous(const rtl::OUString& _sPropertyName) throw ( css::script::BasicErrorException );
css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException );
void initializeNumberFormats() throw ( css::script::BasicErrorException );
- void setNumberFormat( css::lang::Locale _aLocale, const rtl::OUString& _sFormatString) throw( css::script::BasicErrorException );
SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException );
protected:
virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
diff --git a/unusedcode.easy b/unusedcode.easy
index ee7ea3e..cd2ce8c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -9,10 +9,8 @@ SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsi
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
ScMenuFloatingWindow::getDoc()
-ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
-ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
String::String(unsigned short)
SvListView::GetModel() const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
commit c17f51c74ce8ef4fc4827766ce9c1c338a3e54c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 13 21:23:04 2012 +0000
The additional methods of SO2_*_REF over SV_*_REF are now unused
so they can now be replaced by SV_*_REF now
Change-Id: I2207d6582cab5f41851064f3d0c773e9421c0078
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 1efff93..2e57e74 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -48,8 +48,6 @@
#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <sot/sotref.hxx>
-
class ScEditEngineDefaulter;
class SfxStyleSheetBasePool;
class SfxStyleSheetHint;
@@ -448,8 +446,8 @@ public:
void UpdateAcceptChangesDialog();
-SO2_DECL_REF(ScDocShell)
-SO2_IMPL_REF(ScDocShell)
+SV_DECL_REF(ScDocShell)
+SV_IMPL_REF(ScDocShell)
/** Create before modifications of the document and then destroy.
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index b0bb345..4e205db 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -71,9 +71,6 @@ public:
void EndListeningAll();
};
-//SO2_DECL_REF( ScServerObject )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 5641f1a..2d94c35 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -55,11 +55,6 @@
namespace sd
{
-#ifndef SO2_DECL_SVSTORAGE_DEFINED
-#define SO2_DECL_SVSTORAGE_DEFINED
-SO2_DECL_REF(SvStorage)
-#endif
-
TYPEINIT1( FuPresentationLayout, FuPoor );
#define DOCUMENT_TOKEN (sal_Unicode('#'))
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 5b0fc2e..17fd4e7 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -99,13 +99,6 @@ using ::com::sun::star::frame::XController;
namespace sd {
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-
-
-
/*************************************************************************
|*
|* SfxRequests fuer Controller bearbeiten
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 8763aa8..59eba37 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -68,16 +68,6 @@
namespace sd {
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-#ifndef SO2_DECL_SVSTORAGE_DEFINED
-#define SO2_DECL_SVSTORAGE_DEFINED
-SO2_DECL_REF(SvStorage)
-#endif
-
-
/*************************************************************************
|*
|* SfxRequests fuer Gallery bearbeiten
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index e43d175..0912a8a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -91,11 +91,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace sd {
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-
TYPEINIT1(View, FmFormView);
/*************************************************************************
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 20a1474..e664c01 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -68,15 +68,6 @@
namespace sd {
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-#ifndef SO2_DECL_SVSTORAGE_DEFINED
-#define SO2_DECL_SVSTORAGE_DEFINED
-SO2_DECL_REF(SvStorage)
-#endif
-
using namespace ::com::sun::star;
// ------------------------
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index bcf5713..7c56eb5 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -84,11 +84,6 @@
#include "Window.hxx"
#include "fupoor.hxx"
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-
namespace sd { namespace ui { namespace table {
extern SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
} } }
diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk
index 371ab98..4a0ff16 100644
--- a/sot/Package_inc.mk
+++ b/sot/Package_inc.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Package_add_file,sot_inc,inc/sot/formats.hxx,sot/formats.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/object.hxx,sot/object.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdata.hxx,sot/sotdata.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdllapi.h,sot/sotdllapi.h))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotref.hxx,sot/sotref.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/stg.hxx,sot/stg.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storage.hxx,sot/storage.hxx))
$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storinfo.hxx,sot/storinfo.hxx))
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index b62c97f..726b243 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -57,7 +57,6 @@ public:
void PutSuperClass( const SotFactory * );
virtual void * CreateInstance( SotObject ** ppObj = NULL ) const;
- void * CastAndAddRef( SotObject * ) const;
sal_Bool Is( const SotFactory * pSuperClass ) const;
const SotFactory * GetSuper( sal_uInt16 nPos ) const
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 81d3d37..b1b9316 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -20,9 +20,9 @@
#ifndef _SOT_OBJECT_HXX
#define _SOT_OBJECT_HXX
-#include <sot/sotref.hxx>
#include <sot/sotdata.hxx>
#include <tools/globname.hxx>
+#include <tools/ref.hxx>
#include "sot/sotdllapi.h"
/*************************************************************************
@@ -287,8 +287,6 @@ public:
sal_Bool Owner() const { return bOwner; }
- void* CastAndAddRef( const SotFactory * pFact );
-
sal_uInt16 GetOwnerLockCount() const { return nOwnerLockCount; }
void OwnerLock( sal_Bool bLock );
@@ -302,7 +300,7 @@ private:
};
//==================class SotObjectRef======================================
-SV_IMPL_REF(SotObject)
+SV_DECL_IMPL_REF(SotObject)
#endif // _IFACE_HXX
diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx
deleted file mode 100644
index 4465909..0000000
--- a/sot/inc/sot/sotref.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SOT_SOTREF_HXX
-#define _SOT_SOTREF_HXX
-
-#include <tools/ref.hxx>
-
-//========================================================================
-#ifndef SVT_DECL_SOTOBJECT_DEFINED
-#define SVT_DECL_SOTOBJECT_DEFINED
-class SotObject;
-class SotObjectRef
-{
- PRV_SV_DECL_REF(SotObject)
-};
-#endif
-
-//========================================================================
-#define SO2_DECL_REF(ClassName) \
-class ClassName; \
-class ClassName##Ref \
-{ \
- PRV_SV_DECL_REF(ClassName) \
- inline ClassName##Ref( const SotObjectRef & ); \
- inline ClassName##Ref( SotObject * pObjP ); \
-};
-
-#define SO2_IMPL_REF(ClassName) \
-SV_IMPL_REF(ClassName) \
-inline ClassName##Ref::ClassName##Ref( const SotObjectRef & r ) \
-{ \
- pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( &r ); \
-} \
-inline ClassName##Ref::ClassName##Ref( SotObject * pObjP ) \
-{ \
- pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( pObjP );\
-}
-
-
-#define SO2_DECL_IMPL_REF(ClassName) \
- SO2_DECL_REF(ClassName) \
- SO2_IMPL_REF(ClassName)
-
-#endif // _SO2REF_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 3a01028..abe1d83 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -80,9 +80,9 @@ public:
#ifndef SOT_DECL_SOTSTORAGESTREAM_DEFINED
#define SOT_DECL_SOTSTORAGESTREAM_DEFINED
-SO2_DECL_REF(SotStorageStream)
+SV_DECL_REF(SotStorageStream)
#endif
-SO2_IMPL_REF(SotStorageStream)
+SV_IMPL_REF(SotStorageStream)
namespace ucbhelper
{
@@ -210,9 +210,9 @@ public:
#ifndef SOT_DECL_SOTSTORAGE_DEFINED
#define SOT_DECL_SOTSTORAGE_DEFINED
-SO2_DECL_REF(SotStorage)
+SV_DECL_REF(SotStorage)
#endif
-SO2_IMPL_REF(SotStorage)
+SV_IMPL_REF(SotStorage)
#define SvStorage SotStorage
#define SvStorageRef SotStorageRef
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 7835683..28c2850 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -195,35 +195,6 @@ void * SotFactory::CreateInstance( SotObject ** ppObj ) const
return pCreateFunc( ppObj );
}
-//=========================================================================
-void * SotFactory::CastAndAddRef
-(
- SotObject * pObj /* Das Objekt von dem der Typ gepr"uft wird. */
-) const
-/* [Beschreibung]
-
- Ist eine Optimierung, damit die Ref-Klassen k"urzer implementiert
- werden k"onnen. pObj wird auf den Typ der Factory gecastet.
- In c++ (wenn es immer erlaubt w"are) w"urde der void * wie im
- Beispiel gebildet.
- Factory der Klasse SvPersist.
- void * p = (void *)(SvPersist *)pObj;
-
- [R"uckgabewert]
-
- void *, NULL, pObj war NULL oder das Objekt war nicht vom Typ
- der Factory.
- Ansonsten wird pObj zuerst auf den Typ der Factory
- gecastet und dann auf void *.
-
- [Querverweise]
-
- <SotObject::CastAndAddRef>
-*/
-{
- return pObj ? pObj->CastAndAddRef( this ) : NULL;
-}
-
/*************************************************************************
|* SotFactory::Is()
|*
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 3bf6d92..b69d260 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -72,19 +72,6 @@ IUnknown * SotObject::GetInterface( const SvGlobalName & )
return NULL;
}
-/*************************************************************************
-|* SotObject::CastAndAddRef()
-|*
-|* Beschreibung
-*************************************************************************/
-void* SotObject::CastAndAddRef( const SotFactory * pFact )
-{
- void * pCast = Cast( pFact );
- if( pCast )
- AddRef();
- return pCast;
-}
-
//=========================================================================
void SotObject::OwnerLock
(
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6388013..b5a561d 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -26,7 +26,6 @@
#include <rtl/strbuf.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx>
-#include <sot/sotref.hxx>
#include <sot/storage.hxx>
#include <svl/lstner.hxx>
#include <vcl/jobset.hxx>
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 375b733..49d9d88 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -65,8 +65,8 @@ struct assertion_traits<String>
};
}
-SO2_DECL_REF(SmDocShell)
-SO2_IMPL_REF(SmDocShell)
+SV_DECL_REF(SmDocShell)
+SV_IMPL_REF(SmDocShell)
class TestOutputDevice : public OutputDevice
{
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 3e39f5d..3ebbd61 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -55,8 +55,8 @@
#include <sfx2/zoomitem.hxx>
-SO2_DECL_REF(SmDocShell)
-SO2_IMPL_REF(SmDocShell)
+SV_DECL_REF(SmDocShell)
+SV_IMPL_REF(SmDocShell)
using namespace ::com::sun::star;
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index ed2e3ef..9905b23 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -50,8 +50,8 @@
#include "shellres.hxx"
#include "docufld.hxx"
-SO2_DECL_REF(SwDocShell)
-SO2_IMPL_REF(SwDocShell)
+SV_DECL_REF(SwDocShell)
+SV_IMPL_REF(SwDocShell)
using namespace ::com::sun::star;
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3f9262e..7d71977 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -50,8 +50,8 @@
#include "docsh.hxx"
-SO2_DECL_REF(SwDocShell)
-SO2_IMPL_REF(SwDocShell)
+SV_DECL_REF(SwDocShell)
+SV_IMPL_REF(SwDocShell)
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 2f1bf86..de9828e 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -67,8 +67,8 @@
#include "modeltoviewhelper.hxx"
#include "scriptinfo.hxx"
-SO2_DECL_REF(SwDocShell)
-SO2_IMPL_REF(SwDocShell)
+SV_DECL_REF(SwDocShell)
+SV_IMPL_REF(SwDocShell)
using namespace ::com::sun::star;
diff --git a/unusedcode.easy b/unusedcode.easy
index bedbdf7..ee7ea3e 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -13,7 +13,6 @@ ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Loca
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-SotFactory::CastAndAddRef(SotObject*) const
String::String(unsigned short)
SvListView::GetModel() const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
commit a94b6ec2d57cab51d79329ea62d908f3b3713505
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 13 21:02:02 2012 +0000
callcatcher: update unused code post binfilter death
Change-Id: I5b25d14ef2769126f98523551597f43812b9feb7
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 039c14e..c3e3156 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -70,25 +70,11 @@ using namespace ::com::sun::star::container;
* The implementations of SvxConfigFunctionListBox and
* SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx
*/
-SvxConfigFunctionListBox::SvxConfigFunctionListBox( Window* pParent, const ResId& rResId)
- : SvTreeListBox( pParent, rResId )
- , pCurEntry( 0 )
- , m_pDraggingEntry( 0 )
-{
- SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
- Init();
-}
-
SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent)
: SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT)
, pCurEntry(0)
, m_pDraggingEntry(0)
{
- Init();
-}
-
-void SvxConfigFunctionListBox::Init()
-{
GetModel()->SetSortMode( SortAscending );
// Timer for the BallonHelp
@@ -198,35 +184,6 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
return DND_ACTION_NONE;
}
-SvxConfigGroupListBox::SvxConfigGroupListBox(
- Window* pParent, const ResId& rResId,
- bool _bShowSlots, const Reference< frame::XFrame >& xFrame )
- : SvTreeListBox( pParent, rResId )
- , m_bShowSlots( _bShowSlots )
- , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
- , m_libImage(CUI_RES(RID_CUIIMG_LIB))
- , m_macImage(CUI_RES(RID_CUIIMG_MACRO))
- , m_docImage(CUI_RES(RID_CUIIMG_DOC))
- , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
- , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
-{
- FreeResource();
-
- if ( xFrame != NULL )
- {
- m_xFrame.set( xFrame );
- }
-
- SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
-
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-
- SetNodeBitmaps(
- aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
- );
-}
-
SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent)
: SvTreeListBox(pParent,
WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT)
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index d601623..df3575f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -71,31 +71,6 @@ void ShowErrorDialog( const Any& aException )
delete pDlg;
}
-void SFTreeListBox::Init()
-{
- SetSelectionMode( SINGLE_SELECTION );
-
- SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
- WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
- WB_HASLINES | WB_HASLINESATROOT );
- SetNodeDefaultImages();
-
- nMode = 0xFF; // everything
-}
-
-SFTreeListBox::SFTreeListBox(Window* pParent, const ResId& rResId)
- : SvTreeListBox(pParent, ResId(rResId.GetId(),*rResId.GetResMgr()))
- , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
- , m_libImage(CUI_RES(RID_CUIIMG_LIB))
- , m_macImage(CUI_RES(RID_CUIIMG_MACRO))
- , m_docImage(CUI_RES(RID_CUIIMG_DOC))
- , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
- , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS))
-{
- FreeResource();
- Init();
-}
-
SFTreeListBox::SFTreeListBox(Window* pParent)
: SvTreeListBox(pParent)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
@@ -105,7 +80,14 @@ SFTreeListBox::SFTreeListBox(Window* pParent)
, m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
, m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
{
- Init();
+ SetSelectionMode( SINGLE_SELECTION );
+
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
+ WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
+ WB_HASLINES | WB_HASLINESATROOT );
+ SetNodeDefaultImages();
+
+ nMode = 0xFF; // everything
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &)
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 34d85aa..bfbe49f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -69,8 +69,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
- void Init();
-
protected:
void ExpandTree( SvTreeListEntry* pRootEntry );
virtual void RequestingChildren( SvTreeListEntry* pParent );
@@ -80,7 +78,6 @@ public:
void Init( const ::rtl::OUString& language );
void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
- SFTreeListBox(Window* pParent, const ResId& rRes);
SFTreeListBox(Window* pParent);
~SFTreeListBox();
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 28459b3..508ca7c 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -100,10 +100,7 @@ friend class SvxConfigGroupListBox;
DECL_LINK(TimerHdl, void *);
virtual void MouseMove( const MouseEvent& rMEvt );
- void Init();
-
public:
- SvxConfigFunctionListBox(Window*, const ResId&);
SvxConfigFunctionListBox(Window* pParent);
~SvxConfigFunctionListBox();
void ClearAll();
@@ -165,12 +162,6 @@ protected:
using SvListView::Expand;
public:
- SvxConfigGroupListBox (
- Window* pParent, const ResId&,
- bool _bShowSlots,
- const ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame >& xFrame
- );
SvxConfigGroupListBox(Window* pParent);
~SvxConfigGroupListBox();
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 49ab5b6..6e75116 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -80,12 +80,4 @@ void DescriptionEdit::Clear()
pVScrBar->Hide();
}
-// -----------------------------------------------------------------------
-
-void DescriptionEdit::SetDescription( const String& rDescription )
-{
- SetText( rDescription );
- UpdateScrollBar();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index fadbea0..7c8eb3e 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -40,7 +40,6 @@ namespace dp_gui
inline ~DescriptionEdit() {}
void Clear();
- void SetDescription( const String& rDescription );
};
} // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 442f349..25e7c76 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -160,8 +160,6 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual long Notify( NotifyEvent& rNEvt );
- const Size GetMinOutputSizePixel() const;
-
virtual void RecalcAll();
virtual void selectEntry( const long nPos );
//-----------------
@@ -227,20 +225,6 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
delete m_pRemoveBtn;
}
-//------------------------------------------------------------------------------
-const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const
-{
- Size aMinSize( ExtensionBox_Impl::GetMinOutputSizePixel() );
- long nHeight = aMinSize.Height();
- nHeight += m_pOptionsBtn->GetSizePixel().Height();
- nHeight += 2 * TOP_OFFSET;
- long nWidth = m_pOptionsBtn->GetSizePixel().Width();
- nWidth *= 3;
- nWidth += 5*TOP_OFFSET + 20;
-
- return Size( nWidth, nHeight );
-}
-
// -----------------------------------------------------------------------
void ExtBoxWithBtns_Impl::RecalcAll()
{
diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/filter/inc/filter/msfilter/dffpropset.hxx
index a11b382..ae838c3 100644
--- a/filter/inc/filter/msfilter/dffpropset.hxx
+++ b/filter/inc/filter/msfilter/dffpropset.hxx
@@ -59,7 +59,6 @@ class MSFILTER_DLLPUBLIC DffPropSet
bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const;
/** Returns a string property. */
::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const;
- void SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const;
sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const;
void InitializePropSet( sal_uInt16 nPropSetType ) const;
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index ef1946b..b798be0 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -548,8 +548,6 @@ public:
sal_uInt32 nMaxLen,
bool bUniCode = sal_False);
- static bool ReadCommonRecordHeader( DffRecordHeader& rRec,
- SvStream& rIn) SAL_WARN_UNUSED_RESULT;
static bool ReadCommonRecordHeader( SvStream& rSt,
sal_uInt8& rVer,
sal_uInt16& rInst,
diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx
index c3ade4d..495bf4c 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1316,13 +1316,6 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const
return aBuffer.makeStringAndClear();
}
-void DffPropSet::SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const
-{
- nId &= 0x3ff;
- mpPropSetEntries[ nId ].aFlags.bSet = true;
- mpPropSetEntries[ nId ].nContent = nValue;
-};
-
sal_Bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const
{
nRecType &= 0x3ff;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9081122..861be9d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6240,15 +6240,6 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
return ( GRFILTER_OK == nRes ); // Ergebniss melden
}
-/* static */
-bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec,
- SvStream& rIn)
-{
- rRec.nFilePos = rIn.Tell();
- return SvxMSDffManager::ReadCommonRecordHeader(rIn,rRec.nRecVer,
- rRec.nRecInstance, rRec.nRecType, rRec.nRecLen);
-}
-
/* also static */
bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt,
sal_uInt8& rVer, sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength)
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 0424b0d..81d3d37 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -269,7 +269,6 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
{
friend class SotFactory;
friend class SvObject;
- sal_uInt16 nStrongLockCount;
sal_uInt16 nOwnerLockCount;
sal_Bool bOwner:1,
bSVObject:1, // Ist Proxy, dann TRUE wenn andere Seite SV ist
@@ -290,9 +289,7 @@ public:
void* CastAndAddRef( const SotFactory * pFact );
- sal_uInt16 Lock( sal_Bool bLock ); // affects nStrongLockCount
sal_uInt16 GetOwnerLockCount() const { return nOwnerLockCount; }
- sal_uInt16 GetStrongLockCount() const { return nStrongLockCount; }
void OwnerLock( sal_Bool bLock );
sal_Bool DoClose();
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 0127990..3a01028 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -75,9 +75,6 @@ public:
virtual sal_Bool Commit();
virtual sal_Bool Revert();
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- GetXInputStream() const;
virtual sal_Size remainingSize();
};
@@ -127,7 +124,6 @@ public:
SO2_DECL_BASIC_CLASS_DLL(SotStorage,SOTDATA())
SvMemoryStream * CreateMemoryStream();
- const SvStream * GetSvStream();
static sal_Bool IsStorageFile( const String & rFileName );
static sal_Bool IsStorageFile( SvStream* pStream );
@@ -136,8 +132,7 @@ public:
virtual sal_Bool Validate();
- void SetKey( const rtl::OString& rKey );
- const rtl::OString& GetKey() const { return m_aKey; }
+ const rtl::OString& GetKey() const;
void SetVersion( long nVers )
{
@@ -172,7 +167,6 @@ public:
virtual sal_uLong GetFormat();
virtual String GetUserName();
virtual sal_Bool ShouldConvert();
- void SetName( const String& rName );
// Liste aller Elemente
virtual void FillInfoList( SvStorageInfoList * ) const;
@@ -189,9 +183,6 @@ public:
SotStorage * OpenSotStorage( const String & rEleName,
StreamMode = STREAM_STD_READWRITE,
StorageMode = STORAGE_TRANSACTED );
- SotStorage * OpenUCBStorage( const String & rEleName,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = STORAGE_TRANSACTED );
// Abfrage auf Storage oder Stream
virtual sal_Bool IsStream( const String & rEleName ) const;
virtual sal_Bool IsStorage( const String & rEleName ) const;
@@ -207,7 +198,6 @@ public:
const String & rNewName );
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool IsOLEStorage() const;
static sal_Bool IsOLEStorage( const String & rFileName );
static sal_Bool IsOLEStorage( SvStream* pStream );
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 3264015..3bf6d92 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -44,8 +44,7 @@ SO2_IMPL_BASIC_CLASS_DLL(SotObject,SotObjectFactory,
|* Beschreibung
*************************************************************************/
SotObject::SotObject()
- : nStrongLockCount( 0 )
- , nOwnerLockCount( 0 )
+ : nOwnerLockCount( 0 )
, bOwner ( sal_True )
, bSVObject ( sal_False )
, bInClose ( sal_False )
@@ -87,28 +86,6 @@ void* SotObject::CastAndAddRef( const SotFactory * pFact )
}
//=========================================================================
-sal_uInt16 SotObject::Lock( sal_Bool bLock )
-{
- SotObjectRef xHoldAlive( this );
- sal_uInt16 nRet;
- if( bLock )
- {
- AddRef();
- nRet = ++nStrongLockCount;
- }
- else
- {
- nRet = --nStrongLockCount;
- ReleaseRef();
- }
-
- if( !nRet && !nOwnerLockCount )
- DoClose();
-
- return nRet;
-}
-
-//=========================================================================
void SotObject::OwnerLock
(
sal_Bool bLock /* sal_True, lock. sal_False, unlock. */
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index bc0ab82..5fd1efa 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -360,36 +360,6 @@ sal_Bool SotStorageStream::SetProperty( const String& rName, const ::com::sun::s
}
}
-sal_Bool SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- UCBStorageStream* pStg = PTR_CAST( UCBStorageStream, pOwnStm );
- if ( pStg )
- {
- return pStg->GetProperty( rName, rValue );
- }
- else
- {
- OSL_FAIL("Not implemented!");
- return sal_False;
- }
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SotStorageStream::GetXInputStream() const
-{
- UCBStorageStream* pStg = PTR_CAST( UCBStorageStream, pOwnStm );
- if ( pStg )
- {
- return pStg->GetXInputStream();
- }
- else
- {
- OSL_FAIL("Not implemented!");
- return ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >();
- }
-}
-
-
-
/************** class SotStorage ******************************************
*************************************************************************/
class SotStorageFactory : public SotFactory
@@ -732,13 +702,9 @@ const String & SotStorage::GetName() const
return m_aName;
}
-void SotStorage::SetName( const String& rName )
+const rtl::OString& SotStorage::GetKey() const
{
- // This method is necessary because most storages will not be opened with a FileName, but an external stream instead
- // This stream is a stream opened by a UCP and so aName is only used as a transport for all client code of the SotStorage
- // class that depends on the fact that a root storage has a name
- DBG_ASSERT( !GetName().Len(), "SetName() must not be called when the storage already has a name!" );
- m_aName = rName;
+ return m_aKey;
}
/*************************************************************************
@@ -960,27 +926,6 @@ SotStorage * SotStorage::OpenSotStorage( const String & rEleName,
return NULL;
}
-SotStorage * SotStorage::OpenUCBStorage( const String & rEleName,
- StreamMode nMode,
- StorageMode nStorageMode )
-{
- SotStorage * pStor = NULL;
- DBG_ASSERT( Owner(), "must be owner" );
- if( m_pOwnStg )
- {
- nMode |= STREAM_SHARE_DENYALL;
- ErrCode nE = m_pOwnStg->GetError();
- BaseStorage * p = m_pOwnStg->OpenUCBStorage( rEleName, nMode,
- (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True );
- pStor = new SotStorage( p );
- if( !nE )
- m_pOwnStg->ResetError(); // kein Fehler setzen
- }
- else
- SetError( SVSTREAM_GENERALERROR );
- return pStor;
-}
-
/*************************************************************************
|* SotStorage::IsStream()
|* SotStorage::IsStorage()
@@ -1093,15 +1038,6 @@ sal_Bool SotStorage::MoveTo( const String & rEleName,
return SVSTREAM_OK == GetError();
}
-const SvStream* SotStorage::GetSvStream()
-{
- const SvStream* pResult = 0;
- DBG_ASSERT( Owner(), "must be owner" );
- if( m_pOwnStg )
- pResult = m_pOwnStg->GetSvStream();
- return pResult;
-}
-
sal_Bool SotStorage::Validate()
{
DBG_ASSERT( m_bIsRoot, "Validate nur an Rootstorage" );
@@ -1125,29 +1061,6 @@ sal_Bool SotStorage::SetProperty( const String& rName, const ::com::sun::star::u
}
}
-sal_Bool SotStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
- if ( pStg )
- {
- return pStg->GetProperty( rName, rValue );
- }
- else if ( rName.CompareToAscii("MediaType") == COMPARE_EQUAL )
- {
- String aStr = SotExchange::GetFormatMimeType( GetFormat() );
- sal_uInt16 nPos = aStr.Search(';');
- if ( nPos != STRING_NOTFOUND )
- aStr = aStr.Copy( 0, nPos );
- rValue <<= (::rtl::OUString) aStr;
- return sal_True;
- }
- else
- {
- DBG_WARNING("W1:Not implemented!");
- return sal_False;
- }
-}
-
sal_Bool SotStorage::IsOLEStorage() const
{
UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
@@ -1164,24 +1077,6 @@ sal_Bool SotStorage::IsOLEStorage( SvStream* pStream )
return Storage::IsStorageFile( pStream );
}
-void SotStorage::SetKey( const rtl::OString& rKey )
-{
- m_aKey = rKey;
- if ( !IsOLEStorage() )
- {
- sal_uInt8 aBuffer[RTL_DIGEST_LENGTH_SHA1];
- rtlDigestError nError = rtl_digest_SHA1( m_aKey.getStr(), m_aKey.getLength(), aBuffer, RTL_DIGEST_LENGTH_SHA1 );
- if ( nError == rtl_Digest_E_None )
- {
- sal_uInt8* pBuffer = aBuffer;
- ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 );
- ::com::sun::star::uno::Any aAny;
- aAny <<= aSequ;
- SetProperty( ::rtl::OUString("EncryptionKey"), aAny );
- }
- }
-}
-
SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
const String& rEleName, StreamMode nMode )
{
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 5131f99..2e0e483 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -452,11 +452,6 @@ public:
sal_Size & rLength,
bool & rModify);
- static sal_Char const * scanParameters(sal_Char const * pBegin,
- sal_Char const * pEnd,
- INetContentTypeParameterList *
- pParameters);
-
static sal_Unicode const * scanParameters(sal_Unicode const * pBegin,
sal_Unicode const * pEnd,
INetContentTypeParameterList *
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index fc6c57e..980840f 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -247,8 +247,6 @@ public:
void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
- void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
- void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
void Move( long nHorzMove, long nVertMove );
void Translate( const Point& rTrans );
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 732f9b4..a6dff02 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -319,16 +319,6 @@ void PolyPolygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult )
ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_UNION );
}
-void PolyPolygon::GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_DIFF );
-}
-
-void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_XOR );
-}
-
void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const
{
// Convert to B2DPolyPolygon, temporarily. It might be
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index ae1bdb8..2def17c 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -825,211 +825,6 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin,
}
// static
-sal_Char const * INetMIME::scanParameters(sal_Char const * pBegin,
- sal_Char const * pEnd,
- INetContentTypeParameterList *
- pParameters)
-{
- ParameterList aList;
- sal_Char const * pParameterBegin = pBegin;
- for (sal_Char const * p = pParameterBegin;; pParameterBegin = p)
- {
- pParameterBegin = skipLinearWhiteSpaceComment(p, pEnd);
- if (pParameterBegin == pEnd || *pParameterBegin != ';')
- break;
- p = pParameterBegin + 1;
-
- sal_Char const * pAttributeBegin = skipLinearWhiteSpaceComment(p,
- pEnd);
- p = pAttributeBegin;
- bool bDowncaseAttribute = false;
- while (p != pEnd && isTokenChar(*p) && *p != '*')
- {
- bDowncaseAttribute = bDowncaseAttribute || isUpperCase(*p);
- ++p;
- }
- if (p == pAttributeBegin)
- break;
- rtl::OString aAttribute(pAttributeBegin, (p - pAttributeBegin));
- if (bDowncaseAttribute)
- aAttribute = aAttribute.toAsciiLowerCase();
-
- sal_uInt32 nSection = 0;
- if (p != pEnd && *p == '*')
- {
- ++p;
- if (p != pEnd && isDigit(*p)
- && !scanUnsigned(p, pEnd, false, nSection))
- break;
- }
-
- bool bPresent;
- Parameter ** pPos = aList.find(aAttribute, nSection, bPresent);
-
- bool bExtended = false;
- if (p != pEnd && *p == '*')
- {
- ++p;
- bExtended = true;
- }
-
- p = skipLinearWhiteSpaceComment(p, pEnd);
-
- if (p == pEnd || *p != '=')
- break;
-
- p = skipLinearWhiteSpaceComment(p + 1, pEnd);
-
- rtl::OString aCharset;
- rtl::OString aLanguage;
- rtl::OStringBuffer aValue;
- if (bExtended)
- {
- if (nSection == 0)
- {
- sal_Char const * pCharsetBegin = p;
- bool bDowncaseCharset = false;
- while (p != pEnd && isTokenChar(*p) && *p != '\'')
- {
- bDowncaseCharset = bDowncaseCharset || isUpperCase(*p);
- ++p;
- }
- if (p == pCharsetBegin)
- break;
- if (pParameters)
- {
- aCharset = rtl::OString(
- pCharsetBegin, p - pCharsetBegin);
- if (bDowncaseCharset)
- aCharset = aCharset.toAsciiLowerCase();
- }
-
- if (p == pEnd || *p != '\'')
- break;
- ++p;
-
- sal_Char const * pLanguageBegin = p;
- bool bDowncaseLanguage = false;
- int nLetters = 0;
- for (; p != pEnd; ++p)
- if (isAlpha(*p))
- {
- if (++nLetters > 8)
- break;
- bDowncaseLanguage = bDowncaseLanguage
- || isUpperCase(*p);
- }
- else if (*p == '-')
- {
- if (nLetters == 0)
- break;
- nLetters = 0;
- }
- else
- break;
- if (nLetters == 0 || nLetters > 8)
- break;
- if (pParameters)
- {
- aLanguage = rtl::OString(
- pLanguageBegin, p - pLanguageBegin);
- if (bDowncaseLanguage)
- aLanguage = aLanguage.toAsciiLowerCase();
- }
-
- if (p == pEnd || *p != '\'')
- break;
- ++p;
- }
- if (pParameters)
- {
- while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p)))
- {
- if (*p == '%')
- {
- if (p + 2 < pEnd)
- {
- int nWeight1 = getHexWeight(p[1]);
- int nWeight2 = getHexWeight(p[2]);
- if (nWeight1 >= 0 && nWeight2 >= 0)
- {
- aValue.append(sal_Char(nWeight1 << 4 | nWeight2));
- p += 3;
- continue;
- }
- }
- }
- aValue.append(*p++);
- }
- }
- else
- while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p)))
- ++p;
- }
- else if (p != pEnd && *p == '"')
- {
- if (pParameters)
- {
- bool bInvalid = false;
- for (++p;;)
- {
- if (p == pEnd)
- {
- bInvalid = true;
- break;
- }
- else if (*p == '"')
- {
- ++p;
- break;
- }
- else if (*p == 0x0D) // CR
- {
- if (pEnd - p < 3 || p[1] != 0x0A // LF
- || !isWhiteSpace(p[2]))
- {
- bInvalid = true;
- break;
- }
- p += 2;
- }
- else if (*p == '\\' && ++p == pEnd)
- {
- bInvalid = true;
- break;
- }
- aValue.append(*p++);
- }
- if (bInvalid)
- break;
- }
- else
- {
- sal_Char const * pStringEnd = skipQuotedString(p, pEnd);
- if (p == pStringEnd)
- break;
- p = pStringEnd;
- }
- }
- else
- {
- sal_Char const * pTokenBegin = p;
- while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p)))
- ++p;
- if (p == pTokenBegin)
- break;
- if (pParameters)
- aValue.append(pTokenBegin, static_cast< sal_Int32 >(p - pTokenBegin));
- }
-
- if (!bPresent)
- *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage,
- aValue.makeStringAndClear(), nSection, bExtended);
- }
- return parseParameters(aList, pParameters) ? pParameterBegin : pBegin;
-}
-
-// static
sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin,
sal_Unicode const * pEnd,
INetContentTypeParameterList *
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index 7c090b7..6e264fc 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -121,13 +121,6 @@ protected:
public:
// properties: Referer, PostMimeType
static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
- const ::rtl::OUString& rReferer,
- const ::rtl::OUString& rMediaType,
- const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xPostData,
- const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
- UcbLockBytesHandler* pHandler=0 );
-
- static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
StreamMode eMode,
const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
@@ -150,8 +143,6 @@ public:
ErrCode GetError() const
{ return m_nError; }
- void Cancel(); // is alive only for compatibility reasons
-
// the following properties are available when and after the first DataAvailable callback has been executed
String GetContentType() const;
String GetRealURL() const;
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 758aef2..ee5e861 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1572,13 +1572,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
}
//----------------------------------------------------------------------------
-void UcbLockBytes::Cancel()
-{
- // is alive only for compatibility reasons
- OSL_ENSURE( m_bTerminated, "UcbLockBytes is not thread safe so it can be used only syncronously!\n" );
-}
-
-//----------------------------------------------------------------------------
IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl)
{
if ( hasInputStream_Impl() && m_xHandler.Is() )
@@ -1611,45 +1604,6 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre
return xLockBytes;
}
-UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const ::rtl::OUString& rReferer, const ::rtl::OUString& rMediaType,
- const Reference < XInputStream >& xPostData, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler )
-{
- if( !xContent.is() )
- return NULL;
-
- UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler );
- xLockBytes->SetSynchronMode( !pHandler );
- Reference< XActiveDataControl > xSink = (XActiveDataControl*) new UcbDataSink_Impl( xLockBytes );
-
- PostCommandArgument2 aArgument;
- aArgument.Source = xPostData;
- aArgument.Sink = xSink;
- aArgument.MediaType = rMediaType;
- aArgument.Referer = rReferer;
-
- Command aCommand;
- aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("post"));
- aCommand.Argument <<= aArgument;
-
- Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) );
-
- sal_Bool bError = UCBOpenContentSync( xLockBytes,
- xContent,
- aCommand,
- xSink,
- xInteractionHandler,
- xProgressHdl,
- pHandler );
-
- if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) )
- {
- OSL_FAIL("No InputStream, but no error set!" );
- xLockBytes->SetError( ERRCODE_IO_GENERAL );
- }
-
- return xLockBytes;
-}
-
UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const Sequence < PropertyValue >& rProps,
StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler )
{
diff --git a/unusedcode.easy b/unusedcode.easy
index e805913..bedbdf7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,9 @@
+FileStream::open(rtl::OString const&, FileAccessMode)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
+GraphicObject::SwapIn(SvStream*)
+LiblantagDataRef::presetDataPath(rtl::OUString const&)
+Line::GetLength() const
+Line::Intersection(Rectangle const&, Line&) const
RelatedMultipart::getIds()
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
@@ -8,9 +13,16 @@ ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Loca
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-SvTreeEntryList::front()
+SotFactory::CastAndAddRef(SotObject*) const
+String::String(unsigned short)
+SvListView::GetModel() const
+SvTreeList::GetChildIterators(SvTreeListEntry const*) const
+SvTreeListEntry::GetChildEntries()
+SvTreeListEntry::GetChildEntries() const
+SvtGraphicStroke::toString() const
TextEngine::GetLeftMargin() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
+UnoControl::UnoControl()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
@@ -32,18 +44,15 @@ apitest::XPropertySet::testAddVetoableChangeListener()
apitest::XPropertySet::testRemovePropertyChangeListener()
apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XSpreadsheetDocument::testGetSheets()
-cairocanvas::CanvasHelper::flush() const
-cairocanvas::CanvasHelper::getPalette()
-cairocanvas::SpriteDeviceHelper::getSurface()
-cairocanvas::TextLayout::draw(_cairo*)
+cairocanvas::TextLayout::useFont(_cairo*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
connectivity::file::OStatement_Base::reset()
+connectivity::mork::MQueryHelper::next()
connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&)
connectivity::mork::OColumnAlias::OColumnAlias()
-connectivity::mozab::MQueryHelper::next()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
@@ -51,6 +60,7 @@ framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
+oox::xls::FormulaProcessorBase::generateRangeList2dString(oox::xls::ApiCellRangeList const&, bool, unsigned short, bool)
sc_apitest::main()
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
@@ -58,3 +68,11 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*)
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector()
+svgio::svgreader::SvgDocument::removeSvgStyleAttributesFromMapper(rtl::OUString const&)
+svgio::svgreader::SvgStyleAttributes::setFillRule(bool const*)
+svgio::svgreader::pathTextBreakupHelper::getLength(rtl::OUString const&) const
+test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
+test::BootstrapFixtureBase::getURLFromWorkdir(char const*)
+writerfilter::analyzerIds()
+writerfilter::createAnalyzer()
+writerfilter::createStreamHandler()
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index 620de4d..b0b1a2b 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -172,8 +172,6 @@ public:
const String& GetDocFileName() const;
sal_uLong GetDocFilePos() const;
- sal_Bool ReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False );
-
sal_Bool SwapOut();
sal_Bool SwapOut( SvStream* pOStm );
sal_Bool SwapIn();
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index baba033..c659274 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -625,14 +625,6 @@ sal_uLong Graphic::GetDocFilePos() const
// ------------------------------------------------------------------------
-sal_Bool Graphic::ReadEmbedded( SvStream& rIStream, sal_Bool bSwap )
-{
- ImplTestRefCount();
- return mpImpGraphic->ImplReadEmbedded( rIStream, bSwap );
-}
-
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::SwapOut()
{
ImplTestRefCount();
More information about the Libreoffice-commits
mailing list