[Libreoffice-commits] core.git: include/svtools svtools/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 9 01:16:15 PDT 2014
include/svtools/transfer.hxx | 1
svtools/source/config/extcolorcfg.cxx | 2 -
svtools/source/config/helpopt.cxx | 1
svtools/source/config/menuoptions.cxx | 21 ---------------
svtools/source/config/miscopt.cxx | 19 --------------
svtools/source/contnr/fileview.cxx | 35 --------------------------
svtools/source/contnr/imivctl1.cxx | 8 ------
svtools/source/control/hyperlabel.cxx | 24 ------------------
svtools/source/control/roadmap.cxx | 29 ---------------------
svtools/source/control/scriptedtext.cxx | 2 -
svtools/source/control/tabbar.cxx | 5 ---
svtools/source/dialogs/addresstemplate.cxx | 9 ------
svtools/source/graphic/grfcache.cxx | 7 -----
svtools/source/misc/itemdel.cxx | 5 ++-
svtools/source/misc/svtaccessiblefactory.cxx | 8 +++---
svtools/source/misc/templatefoldercache.cxx | 20 ---------------
svtools/source/misc/transfer.cxx | 36 ---------------------------
svtools/source/table/tablecontrol_impl.cxx | 5 ---
svtools/source/toolpanel/paneltabbar.cxx | 3 +-
svtools/source/toolpanel/toolpaneldeck.cxx | 1
svtools/source/uno/contextmenuhelper.cxx | 9 +++---
svtools/source/uno/fpicker.cxx | 2 +
svtools/source/uno/treecontrolpeer.cxx | 1
svtools/source/uno/unocontroltablemodel.cxx | 6 ----
24 files changed, 16 insertions(+), 243 deletions(-)
New commits:
commit fa72a0e94dab1a02c067e8e629f68a548bf2492b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 9 10:15:47 2014 +0200
Remove unused code
Change-Id: Ifaab2aecec65ec6e81056e5fca430df8ca3af908
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 62e9a13..8e4965b 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -79,7 +79,6 @@ struct TransferableObjectDescriptor
, mbCanLink(false)
{}
- SVT_DLLPUBLIC friend SvStream& ReadTransferableObjectDescriptor( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
SVT_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
};
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index b85ee8a..770452d 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -116,8 +116,6 @@ public:
void SetColorConfigValue(const OUString& _sName,
const ExtendedColorConfigValue& rValue );
- const OUString& GetLoadedScheme() const {return m_sLoadedScheme;}
-
sal_Bool AddScheme(const OUString& rNode);
sal_Bool RemoveScheme(const OUString& rNode);
void SetModified(){ConfigItem::SetModified();}
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 72e7432..e58d707 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -75,7 +75,6 @@ public:
void SetWelcomeScreen( bool b ) { bWelcomeScreen = b; SetModified(); }
bool IsWelcomeScreen() const { return bWelcomeScreen; }
- OUString GetLocale() const { return aLocale; }
OUString GetSystem() const { return aSystem; }
const OUString& GetHelpStyleSheet()const{return sHelpStyleSheet;}
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 275d4e2..507c486 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -131,30 +131,9 @@ class SvtMenuOptions_Impl : public ConfigItem
bool IsEntryHidingEnabled() const
{ return m_bDontHideDisabledEntries; }
- bool IsFollowMouseEnabled() const
- { return m_bFollowMouse; }
-
TriState GetMenuIconsState() const
{ return m_eMenuIcons; }
- void SetEntryHidingState ( bool bState )
- {
- m_bDontHideDisabledEntries = bState;
- SetModified();
- for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
- iter->Call( this );
- Commit();
- }
-
- void SetFollowMouseState ( bool bState )
- {
- m_bFollowMouse = bState;
- SetModified();
- for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
- iter->Call( this );
- Commit();
- }
-
void SetMenuIconsState(TriState eState)
{
m_eMenuIcons = eState;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 2604eec..3167123 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -162,17 +162,11 @@ class SvtMiscOptions_Impl : public ConfigItem
inline bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
- inline bool IsPluginsEnabledReadOnly() const
- { return m_bIsPluginsEnabledRO; }
-
inline sal_Int16 GetSymbolsSize()
{ return m_nSymbolsSize; }
void SetSymbolsSize( sal_Int16 nSet );
- inline bool IsGetSymbolsSizeReadOnly()
- { return m_bIsSymbolsSizeRO; }
-
OUString GetIconTheme() const;
enum SetModifiedFlag { SET_MODIFIED, DONT_SET_MODIFIED };
@@ -200,9 +194,6 @@ class SvtMiscOptions_Impl : public ConfigItem
*/
void SetIconThemeAutomatically(SetModifiedFlag = SET_MODIFIED);
- inline bool IsGetSymbolsStyleReadOnly()
- { return m_bIsSymbolsStyleRO; }
-
// translate to VCL settings ( "0" = 3D, "1" = FLAT )
inline sal_Int16 GetToolboxStyle()
{ return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; }
@@ -210,18 +201,12 @@ class SvtMiscOptions_Impl : public ConfigItem
// translate from VCL settings
void SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified );
- inline bool IsGetToolboxStyleReadOnly()
- { return m_bIsToolboxStyleRO; }
-
inline bool UseSystemPrintDialog() const
{ return m_bUseSystemPrintDialog; }
inline void SetUseSystemPrintDialog( bool bSet )
{ m_bUseSystemPrintDialog = bSet; SetModified(); }
- inline bool IsUseSystemPrintDialogReadOnly() const
- { return m_bIsUseSystemPrintDialogRO; }
-
inline bool ShowLinkWarningDialog() const
{ return m_bShowLinkWarningDialog; }
@@ -249,10 +234,6 @@ class SvtMiscOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/
static Sequence< OUString > GetPropertyNames();
-
- private:
- // The unittests fail if we call SetModified during initialization in the constructor.
- void ImplSetSymbolsStyleWithoutSettingModifiedFlag( bool bValue, sal_Int16 nSet, const OUString &rName );
};
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index f6dc9e5..26bfd36 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -226,14 +226,11 @@ protected:
public:
inline HashedEntry( const OUString& rName );
inline HashedEntry( const INetURLObject& rURL );
- inline HashedEntry( const HashedEntry& rCopy );
virtual ~HashedEntry();
inline bool operator ==( const HashedEntry& rRef ) const;
inline bool operator !=( const HashedEntry& rRef ) const;
inline bool operator <( const HashedEntry& rRef ) const;
-
- inline const OUString& GetName() const;
};
inline HashedEntry::HashedEntry( const OUString& rName ): maName( rName ), mnHashCode( rName.hashCode() )
@@ -246,10 +243,6 @@ inline HashedEntry::HashedEntry( const INetURLObject& rURL ):
{
}
-inline HashedEntry::HashedEntry( const HashedEntry& r ): maName( r.maName ), mnHashCode( r.mnHashCode )
-{
-}
-
HashedEntry::~HashedEntry()
{
}
@@ -272,11 +265,6 @@ inline bool HashedEntry::operator <( const HashedEntry& rRef ) const
return mnHashCode < rRef.mnHashCode;
}
-inline const OUString& HashedEntry::GetName() const
-{
- return maName;
-}
-
// class HashedEntryList ----------------------------------------------
// provides a list of _unique_ Entries
class HashedEntryList : public boost::ptr_set<HashedEntry> {};
@@ -288,18 +276,11 @@ class NameTranslationEntry : public HashedEntry
protected:
OUString maTranslatedName;
public:
- inline NameTranslationEntry( const OUString& rOriginalName, const OUString& rTranslatedName );
inline NameTranslationEntry( const OString& rOriginalName, const OString& rTranslatedName );
inline const OUString& GetTranslation() const;
};
-inline NameTranslationEntry::NameTranslationEntry( const OUString& rOrg, const OUString& rTrans ):
- HashedEntry( rOrg ),
- maTranslatedName( rTrans )
-{
-}
-
inline NameTranslationEntry::NameTranslationEntry( const OString& rOrg, const OString& rTrans )
: HashedEntry(OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US))
, maTranslatedName(OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8))
@@ -331,14 +312,11 @@ public:
using HashedEntryList::operator==;
using HashedEntryList::operator!=;
- inline bool operator ==( const HashedEntry& rRef ) const;
inline bool operator !=( const HashedEntry& rRef ) const;
const OUString* Translate( const OUString& rName ) const;
// returns NULL, if rName can't be found
- inline void Update(); // clears list and init
-
inline const OUString& GetTransTableFileName() const;
// returns the name for the file, which contains the translation strings
};
@@ -385,11 +363,6 @@ NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ):
Init();
}
-inline bool NameTranslationList::operator ==( const HashedEntry& rRef ) const
-{
- return maHashedURL == rRef;
-}
-
inline bool NameTranslationList::operator !=( const HashedEntry& rRef ) const
{
return maHashedURL != rRef;
@@ -408,12 +381,6 @@ const OUString* NameTranslationList::Translate( const OUString& rName ) const
return pSearch ? &pSearch->GetTranslation() : NULL;
}
-inline void NameTranslationList::Update()
-{
- clear();
- Init();
-}
-
// class NameTranslator_Impl ------------------------------------------
// enables the user to get string substitutions (translations for the content) for a given folder
@@ -523,8 +490,6 @@ public:
inline bool EnableNameReplacing( bool bEnable = true ); // returns false, if action wasn't possible
void SetActualFolder( const INetURLObject& rActualFolder );
- bool GetDocTitle( const OUString& rTargetURL, OUString& rDocTitle ) const;
-
void SetSelectHandler( const Link& _rHdl );
void InitSelection();
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 8876379..e41a988 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -50,14 +50,6 @@
#define EVENTID_SHOW_CURSOR ((void*)1)
#define EVENTID_ADJUST_SCROLLBARS ((void*)2)
-struct SvxIconChoiceCtrlEntry_Impl
-{
- SvxIconChoiceCtrlEntry* _pEntry;
- Point _aPos;
- SvxIconChoiceCtrlEntry_Impl( SvxIconChoiceCtrlEntry* pEntry, const Rectangle& rBoundRect )
- : _pEntry( pEntry), _aPos( rBoundRect.TopLeft()) {}
-};
-
static sal_Bool bEndScrollInvalidate = sal_True;
class IcnViewEdit_Impl : public MultiLineEdit
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 6a8abff..cd7a10d 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -27,30 +27,6 @@
namespace svt
{
-
-
-
- //= FontChanger
-
- class FontChanger
- {
- protected:
- OutputDevice* m_pDev;
-
- public:
- FontChanger( OutputDevice* _pDev, const Font& _rNewFont )
- :m_pDev( _pDev )
- {
- m_pDev->Push( PUSH_FONT );
- m_pDev->SetFont( _rNewFont );
- }
-
- ~FontChanger()
- {
- m_pDev->Pop( );
- }
- };
-
class HyperLabelImpl
{
public:
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 11d3de4..aeef0ff 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -50,32 +50,6 @@ namespace svt
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
};
-
- //= ColorChanger
-
- class ColorChanger
- {
- protected:
- OutputDevice* m_pDev;
-
- public:
- ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor )
- :m_pDev( _pDev )
- {
- m_pDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
- m_pDev->SetLineColor( _rNewLineColor );
- m_pDev->SetFillColor( _rNewFillColor );
- }
-
- ~ColorChanger()
- {
- m_pDev->Pop();
- }
- };
-
-
- //= RoadmapItem
-
class RoadmapItem : public RoadmapTypes
{
private:
@@ -141,10 +115,7 @@ namespace svt
RoadmapItem* InCompleteHyperLabel;
- void addHyperLabel( RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); }
-
HL_Vector& getHyperLabels() { return m_aRoadmapSteps; }
- const HL_Vector& getHyperLabels() const { return m_aRoadmapSteps; }
void insertHyperLabel( ItemIndex _Index, RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.insert( m_aRoadmapSteps.begin() + _Index, _rRoadmapStep ); }
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index acc1ab7..798885b 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -50,7 +50,7 @@ private:
Size maTextSize; /// The size the text will take in the current output device.
/** Assignment operator not implemented to prevent usage. */
- SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& );
+ SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) SAL_DELETED_FUNCTION;
/** Gets the font of the given script type. */
const Font& GetFont( sal_uInt16 _nScript ) const;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 6f293bb..b3727f3 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -80,11 +80,6 @@ struct ImplTabBarItem
return maTabBgColor == Color(COL_AUTO);
}
- bool IsDefaultTabTextColor() const
- {
- return maTabTextColor == Color(COL_AUTO);
- }
-
bool IsSelected(ImplTabBarItem* pCurItem) const
{
return mbSelect || (pCurItem == this);
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 102a5df..cd6cc73 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -259,7 +259,6 @@ public:
getProperty(const sal_Char* _pLocalName) const;
OUString getStringProperty(const sal_Char* _pLocalName) const;
- sal_Int32 getInt32Property(const sal_Char* _pLocalName) const;
OUString getStringProperty(const OUString& _rLocalName) const;
@@ -363,14 +362,6 @@ void AssignmentPersistentData::Commit()
}
- sal_Int32 AssignmentPersistentData::getInt32Property(const sal_Char* _pLocalName) const
- {
- sal_Int32 nReturn = 0;
- getProperty( _pLocalName ) >>= nReturn;
- return nReturn;
- }
-
-
void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue)
{
Sequence< OUString > aNames(1);
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 89bfb60..03dbf56 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -46,8 +46,6 @@ private:
sal_uInt32 mnID3;
sal_uInt32 mnID4;
- GraphicID();
-
public:
@@ -160,7 +158,6 @@ private:
SvgDataPtr maSvgData;
bool ImplInit( const GraphicObject& rObj );
- bool ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); }
void ImplFillSubstitute( Graphic& rSubstitute );
public:
@@ -449,12 +446,8 @@ public:
~GraphicDisplayCacheEntry();
- const GraphicAttr& GetAttr() const { return maAttr; }
- const Size& GetOutputSizePixel() const { return maOutSizePix; }
sal_uLong GetCacheSize() const { return mnCacheSize; }
const GraphicCacheEntry* GetReferencedCacheEntry() const { return mpRefCacheEntry; }
- sal_uLong GetOutDevDrawMode() const { return mnOutDevDrawMode; }
- sal_uInt16 GetOutDevBitCount() const { return mnOutDevBitCount; }
void SetReleaseTime( const ::salhelper::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
const ::salhelper::TTimeValue& GetReleaseTime() const { return maReleaseTime; }
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 1d42a1d..abba40e 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include <boost/noncopyable.hpp>
#include <svtools/itemdel.hxx>
#include <vcl/svapp.hxx>
#include <tools/errcode.hxx>
@@ -31,14 +33,13 @@
-class SfxItemDesruptor_Impl
+class SfxItemDesruptor_Impl: private boost::noncopyable
{
SfxPoolItem *pItem;
Link aLink;
private:
DECL_LINK( Delete, void* );
- SfxItemDesruptor_Impl( const SfxItemDesruptor_Impl& ); // n.i.
public:
SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt );
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 769c5f4..fe8c206 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -18,6 +18,8 @@
*/
#include "svtaccessiblefactory.hxx"
+
+#include <boost/noncopyable.hpp>
#include <osl/module.h>
// #define UNLOAD_ON_LAST_CLIENT_DYING
@@ -58,7 +60,8 @@ namespace svt
//= AccessibleDummyFactory
- class AccessibleDummyFactory : public IAccessibleFactory
+ class AccessibleDummyFactory:
+ public IAccessibleFactory, private boost::noncopyable
{
public:
AccessibleDummyFactory();
@@ -67,9 +70,6 @@ namespace svt
virtual ~AccessibleDummyFactory();
private:
- AccessibleDummyFactory( const AccessibleDummyFactory& ); // never implemented
- AccessibleDummyFactory& operator=( const AccessibleDummyFactory& ); // never implemented
-
oslInterlockedCount m_refCount;
public:
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 81124a2..3963692 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -141,7 +141,6 @@ namespace svt
TemplateContent( const INetURLObject& _rURL );
// attribute access
- inline OUString getName( ) const { return m_sLocalName; }
inline OUString getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); }
inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; }
inline const util::DateTime& getModDate( ) const { return m_aLastModified; }
@@ -149,7 +148,6 @@ namespace svt
inline TemplateFolderContent& getSubContents() { return m_aSubContents; }
inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; }
- inline ConstFolderIterator begin() const { return m_aSubContents.begin(); }
inline ConstFolderIterator end() const { return m_aSubContents.end(); }
inline TemplateFolderContent::size_type
size() const { return m_aSubContents.size(); }
@@ -290,24 +288,6 @@ namespace svt
}
};
-
- /// functor which stores the local name of a TemplateContent
- struct StoreLocalContentName
- :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
- ,public StoreString
- {
- StoreLocalContentName( SvStream& _rStorage ) : StoreString( _rStorage ) { }
-
- void operator() ( const ::rtl::Reference< TemplateContent >& _rxContent ) const
- {
- SAL_WARN( "svtools.misc", "This method must not be used, the whole URL must be stored!" );
-
- // use the base class operator with the local name of the content
- StoreString::operator() ( _rxContent->getName() );
- }
- };
-
-
struct StoreContentURL
:public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
,public StoreString
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 2fda0ad..5f651b2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -78,42 +78,6 @@ using namespace ::com::sun::star::datatransfer::dnd;
#define TOD_SIG1 0x01234567
#define TOD_SIG2 0x89abcdef
-SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc )
-{
- sal_uInt32 nSize, nViewAspect, nSig1, nSig2;
- //#fdo39428 Remove SvStream operator>>(long&)
- sal_Int32 nTmp(0);
-
- rIStm.ReadUInt32( nSize );
- rIStm >> rObjDesc.maClassName;
- rIStm.ReadUInt32( nViewAspect );
- rIStm.ReadInt32( nTmp );
- rObjDesc.maSize.Width() = nTmp;
- rIStm.ReadInt32( nTmp );
- rObjDesc.maSize.Height() = nTmp;
- rIStm.ReadInt32( nTmp );
- rObjDesc.maDragStartPos.X() = nTmp;
- rIStm.ReadInt32( nTmp );
- rObjDesc.maDragStartPos.Y() = nTmp;
- rObjDesc.maTypeName = rIStm.ReadUniOrByteString(osl_getThreadTextEncoding());
- rObjDesc.maDisplayName = rIStm.ReadUniOrByteString(osl_getThreadTextEncoding());
-
- rIStm.ReadUInt32( nSig1 ).ReadUInt32( nSig2 );
-
- rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect );
-
- // don't use width/height info from external objects
- if( ( TOD_SIG1 != nSig1 ) || ( TOD_SIG2 != nSig2 ) )
- {
- rObjDesc.maSize.Width() = 0;
- rObjDesc.maSize.Height() = 0;
- }
-
- return rIStm;
-}
-
-
-
SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc )
{
const sal_uInt32 nFirstPos = rOStm.Tell(), nViewAspect = rObjDesc.mnViewAspect;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 748e59a..82d41e8 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -269,11 +269,6 @@ namespace svt { namespace table
#ifdef DBG_UTIL
- const char* TableControl_Impl_checkInvariants( const void* _pInstance )
- {
- return static_cast< const TableControl_Impl* >( _pInstance )->impl_checkInvariants();
- }
-
namespace
{
template< typename SCALAR_TYPE >
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 05902d7..710e7f7 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -251,6 +251,7 @@ namespace svt
}
+#if defined WNT
//= NWFTabItemRenderer - declaration
class NWFTabItemRenderer : public ITabBarRenderer
@@ -335,7 +336,7 @@ namespace svt
(void)i_rItemRect;
(void)i_nItemFlags;
}
-
+#endif
//= PanelTabBar_Impl
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 6ec4bca..aec67db 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -88,7 +88,6 @@ namespace svt
void SetLayouter( const PDeckLayouter& i_pNewLayouter );
Window& GetPanelWindowAnchor() { return m_aPanelAnchor; }
- const Window& GetPanelWindowAnchor() const { return m_aPanelAnchor; }
bool IsDead() const { return m_bInDtor; }
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index da76052..dce6708 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include <boost/noncopyable.hpp>
#include <svtools/contextmenuhelper.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/miscopt.hxx>
@@ -53,7 +55,8 @@ namespace svt
// internal helper class to retrieve status updates
class StateEventHelper : public ::com::sun::star::frame::XStatusListener,
- public ::cppu::OWeakObject
+ public ::cppu::OWeakObject,
+ private boost::noncopyable
{
public:
StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider,
@@ -75,10 +78,6 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener,
virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& Event) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- StateEventHelper();
- StateEventHelper( const StateEventHelper& );
- StateEventHelper& operator=( const StateEventHelper& );
-
bool m_bCurrentCommandEnabled;
OUString m_aCommandURL;
uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index c3961e8..3550893 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -27,6 +27,8 @@
#include "vcl/svapp.hxx"
+#include <fpicker.hxx>
+
using css::uno::Reference;
using css::uno::Sequence;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index c6b9aca..e203d87 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -111,7 +111,6 @@ public:
UnoTreeListItem();
virtual ~UnoTreeListItem();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE;
- Image GetImage() const;
void SetImage( const Image& rImage );
OUString GetGraphicURL() const;
void SetGraphicURL( const OUString& rGraphicURL );
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index aca2ce0..10e94d7 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -127,12 +127,6 @@ namespace svt { namespace table
//= UnoControlTableModel
#ifdef DBG_UTIL
- const char* UnoControlTableModel_checkInvariants( const void* _pInstance )
- {
- return static_cast< const UnoControlTableModel* >( _pInstance )->checkInvariants();
- }
-
-
const char* UnoControlTableModel::checkInvariants() const
{
Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel );
More information about the Libreoffice-commits
mailing list