summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/inc/svx/svdobj.hxx12
-rw-r--r--svx/source/svdraw/svdobj.cxx45
-rw-r--r--ucbhelper/inc/ucbhelper/content.hxx7
-rw-r--r--ucbhelper/source/client/content.cxx33
-rw-r--r--unusedcode.easy5
5 files changed, 1 insertions, 101 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 72964cf30e30..4cdf86cff43d 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -308,7 +308,6 @@ public:
SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc.
SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten
SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern
- AutoTimer* pAutoTimer;
// #i68101#
// object name, title and description
@@ -316,9 +315,6 @@ public:
String aObjTitle;
String aObjDescription;
- // Name to be used by applications
- XubString aHTMLName;
-
public:
TYPEINFO();
SdrObjPlusData();
@@ -613,10 +609,6 @@ public:
void SetDescription(const String& rStr);
String GetDescription() const;
- // support for HTMLName
- void SetHTMLName(const String& rStr);
- String GetHTMLName() const;
-
// Fuer Gruppenobjekte
sal_Bool IsGroupObject() const { return GetSubList()!=NULL; }
virtual SdrObjList* GetSubList() const;
@@ -657,10 +649,6 @@ public:
*/
void SetNavigationPosition (const sal_uInt32 nPosition);
- const AutoTimer* GetAutoTimer() const { return pPlusData!=NULL ? pPlusData->pAutoTimer : NULL; }
- AutoTimer* GetAutoTimer() { return pPlusData!=NULL ? pPlusData->pAutoTimer : NULL; }
- AutoTimer* ForceAutoTimer();
-
// #111111#
// To make clearer that this method may trigger RecalcBoundRect and thus may be
// expensive and somtimes problematic (inside a bigger object change You will get
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 77e458f21ad4..99a877a24af4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -239,8 +239,7 @@ TYPEINIT0(SdrObjPlusData);
SdrObjPlusData::SdrObjPlusData():
pBroadcast(NULL),
pUserDataList(NULL),
- pGluePoints(NULL),
- pAutoTimer(NULL)
+ pGluePoints(NULL)
{
}
@@ -249,7 +248,6 @@ SdrObjPlusData::~SdrObjPlusData()
if (pBroadcast !=NULL) delete pBroadcast;
if (pUserDataList!=NULL) delete pUserDataList;
if (pGluePoints !=NULL) delete pGluePoints;
- if (pAutoTimer !=NULL) delete pAutoTimer;
}
SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
@@ -278,13 +276,6 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
pNeuPlusData->aObjTitle = aObjTitle;
pNeuPlusData->aObjDescription = aObjDescription;
- if (pAutoTimer!=NULL) {
- pNeuPlusData->pAutoTimer=new AutoTimer;
- // Handler, etc. nicht mitkopieren!
- }
-
- // For HTMLName: Do not clone, leave uninitialized (empty string)
-
return pNeuPlusData;
}
@@ -640,13 +631,6 @@ void SdrObject::DelReference(SdrVirtObj& rVrtObj)
RemoveListener(rVrtObj);
}
-AutoTimer* SdrObject::ForceAutoTimer()
-{
- ImpForcePlusData();
- if (pPlusData->pAutoTimer==NULL) pPlusData->pAutoTimer=new AutoTimer;
- return pPlusData->pAutoTimer;
-}
-
bool SdrObject::HasRefPoint() const
{
return sal_False;
@@ -803,30 +787,6 @@ String SdrObject::GetDescription() const
return String();
}
-void SdrObject::SetHTMLName(const String& rStr)
-{
- if(rStr.Len() && !pPlusData)
- {
- ImpForcePlusData();
- }
-
- if(pPlusData && pPlusData->aObjName != rStr)
- {
- pPlusData->aHTMLName = rStr;
- SetChanged();
- }
-}
-
-String SdrObject::GetHTMLName() const
-{
- if(pPlusData)
- {
- return pPlusData->aHTMLName;
- }
-
- return String();
-}
-
sal_uInt32 SdrObject::GetOrdNum() const
{
if (pObjList!=NULL) {
@@ -837,9 +797,6 @@ sal_uInt32 SdrObject::GetOrdNum() const
return nOrdNum;
}
-
-
-
sal_uInt32 SdrObject::GetNavigationPosition (void)
{
if (pObjList!=NULL && pObjList->RecalcNavigationPositions())
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 8ba43b0c07f7..e49999bab3cf 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.hxx
@@ -110,13 +110,6 @@ protected:
::com::sun::star::uno::RuntimeException,
::com::sun::star::uno::Exception );
- ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
- sal_Int32 >& rPropertyHandles,
- ResultSetInclude eMode )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
-
public:
/**
* Constructor.
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 53bda7224b1e..2e72cf66099d 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -790,39 +790,6 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
}
//=========================================================================
-Any Content::createCursorAny( const Sequence< sal_Int32 >& rPropertyHandles,
- ResultSetInclude eMode )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- sal_Int32 nCount = rPropertyHandles.getLength();
- Sequence< Property > aProps( nCount );
- Property* pProps = aProps.getArray();
- const sal_Int32* pHandles = rPropertyHandles.getConstArray();
- for ( sal_Int32 n = 0; n < nCount; ++n )
- {
- Property& rProp = pProps[ n ];
- rProp.Name = rtl::OUString(); // n/a
- rProp.Handle = pHandles[ n ];
- }
-
- OpenCommandArgument2 aArg;
- aArg.Mode = ( eMode == INCLUDE_FOLDERS_ONLY )
- ? OpenMode::FOLDERS
- : ( eMode == INCLUDE_DOCUMENTS_ONLY )
- ? OpenMode::DOCUMENTS : OpenMode::ALL;
- aArg.Priority = 0; // unused
- aArg.Sink = Reference< XInterface >(); // unused
- aArg.Properties = aProps;
-
- Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
- aCommand.Handle = -1; // n/a
- aCommand.Argument <<= aArg;
-
- return m_xImpl->executeCommand( aCommand );
-}
-
-//=========================================================================
Reference< XResultSet > Content::createCursor(
const Sequence< rtl::OUString >& rPropertyNames,
ResultSetInclude eMode )
diff --git a/unusedcode.easy b/unusedcode.easy
index 1cdb047a00f1..685c29245be5 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -365,7 +365,6 @@ SVGExport::GetGlyphPlacement() const
SVGExport::IsUseGradient() const
SVGExport::popClip()
SVGExport::pushClip(basegfx::B2DPolyPolygon const&)
-SVGFilter::implImport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
SalColormap::SalColormap(BitmapPalette const&)
SalColormap::SetPalette(BitmapPalette const&)
SalDisplay::IsLocal()
@@ -479,7 +478,6 @@ ScDocument::IsLoadingMedium() const
ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const
ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long)
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-ScFiltersTest::testVba()
ScFormulaCell::ScFormulaCell()
ScGridWindow::InvertSimple(short, int, short, int, unsigned char, unsigned char)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
@@ -618,10 +616,7 @@ SdrObjEditView::Paste(Window*, unsigned long)
SdrObjEditView::Yank(unsigned long)
SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
SdrObject::ClearObjectItem(unsigned short)
-SdrObject::ForceAutoTimer()
SdrObject::FreeGlobalDrawObjectItemPool()
-SdrObject::GetHTMLName() const
-SdrObject::SetHTMLName(String const&)
SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool)
SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool)
SdrPage::AddComment(sdr::Comment const&)