diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-29 12:40:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-29 15:08:43 +0200 |
| commit | 34180700b2686c97cdce0b52ca9578a41a153035 (patch) | |
| tree | 073f3753e4483f30efa3c7c769f23971e6a046d5 | |
| parent | e710170d906fcb248a5e4ff5a3a90cbf0e20003d (diff) | |
loplugin:removeunusedmethods, remove unused stuff
Change-Id: I35456b2a3ad2a84a1d045f09cdfb29e4c19b8350
116 files changed, 9 insertions, 1013 deletions
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx index 39922685be73..52ffd0b700b8 100644 --- a/basegfx/source/inc/hommatrixtemplate.hxx +++ b/basegfx/source/inc/hommatrixtemplate.hxx @@ -391,28 +391,6 @@ namespace basegfx return aWork.ludcmp(nIndex, nParity); } - bool isNormalized() const - { - if(!mpLine) - return true; - - const double fHomValue(get((RowSize - 1), (RowSize - 1))); - - if(::basegfx::fTools::equalZero(fHomValue)) - { - return true; - } - - const double fOne(1.0); - - if(::basegfx::fTools::equal(fOne, fHomValue)) - { - return true; - } - - return false; - } - void doInvert(const ImplHomMatrixTemplate& rWork, const sal_uInt16 nIndex[]) { double fArray[RowSize]; diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 3963b2d21cbf..06cc060053fa 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -202,9 +202,6 @@ public: LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL ); }; -SbiIoSystem* SbGetIoSystem(); - - // chainable items to keep references temporary struct RefSaveItem { diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 529214150b26..cf3b33eef8c1 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -758,13 +758,6 @@ SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n ) -SbiIoSystem* SbGetIoSystem() -{ - SbiInstance* pInst = GetSbData()->pInst; - return pInst ? pInst->GetIoSystem() : NULL; -} - - SbiIoSystem::SbiIoSystem() { for( short i = 0; i < CHANNELS; i++ ) diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 71e75b431fee..fa62ce58e0d1 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -213,11 +213,9 @@ bool UnusedMethods::VisitCXXConstructExpr(const CXXConstructExpr* expr) bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl ) { - // I don't use the normal ignoreLocation() here, because I __want__ to include files that are - // compiled in the $WORKDIR since they may refer to normal code - SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( functionDecl->getLocStart() ); - if( compiler.getSourceManager().isInSystemHeader( expansionLoc )) + if (ignoreLocation(functionDecl)) { return true; + } functionDecl = functionDecl->getCanonicalDecl(); const CXXMethodDecl* methodDecl = dyn_cast_or_null<CXXMethodDecl>(functionDecl); @@ -228,7 +226,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl ) } // ignore stuff that forms part of the stable URE interface if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc( - functionDecl->getNameInfo().getLoc()))) { + functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) { return true; } if (methodDecl && isStandardStuff(methodDecl->getParent()->getQualifiedNameAsString())) { diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index a1c7a363a052..4b4004f49b16 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -26,11 +26,6 @@ class SfxModule; class SfxShell; -// static ---------------------------------------------------------------- - -bool EnableSSO(); -CreateTabPage GetSSOCreator(); - // struct OrderedEntry --------------------------------------------------- struct OrderedEntry diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index eec6a06da4e4..bb021857f951 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -43,10 +43,6 @@ namespace dbaui */ static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); - /** Creates the detail page for Dbase - */ - static VclPtr<SfxTabPage> CreateDbase2( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); - /** Creates the detail page for ado */ static VclPtr<SfxTabPage> CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 629982e08086..901b9b32a690 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -65,9 +65,6 @@ namespace dbaui void SetSourceFieldName( const OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } void SetDestFieldName( const OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } - inline bool clearSourceFieldName() { SetSourceFieldName(OUString()); return true;} - inline bool clearDestFieldName() { SetDestFieldName(OUString()); return true;} - // member access (read) OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); } diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 4b8c8d5cb2cf..98cd998ec0ce 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -141,7 +141,6 @@ namespace dbaui void setActive(bool _bActive = true); void Remove(); - bool IsActiveWindow(){ return m_bActive; } OUString GetTableName() const { return m_pData->GetTableName(); } OUString GetWinName() const { return m_pData->GetWinName(); } diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 80256e7e0d7e..4c9931d4d477 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -70,9 +70,7 @@ namespace dbaui bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } bool IsOptionDef() const { return m_pRB_Def->IsChecked(); } - bool IsOptionAppendData() const { return m_pRB_AppendData->IsChecked(); } bool IsOptionView() const { return m_pRB_View->IsChecked(); } - bool UseHeaderLine() const { return m_pCB_UseHeaderLine->IsChecked(); } OUString GetKeyName() const { return m_pEdKeyName->GetText(); } void setCreateStyleAction(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index b9139c914256..6f5af9e5fe2b 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -101,7 +101,6 @@ protected: virtual bool onFinish() SAL_OVERRIDE; protected: - inline bool isUIEnabled() const { return m_bUIEnabled; } inline void disabledUI() { m_bUIEnabled = false; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 8d48e2d48013..2fea8fb54c16 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -135,7 +135,6 @@ protected: virtual bool onFinish() SAL_OVERRIDE; protected: - inline bool isUIEnabled() const { return m_bUIEnabled; } inline void disabledUI() { m_bUIEnabled = false; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 5d43d8fb6451..3366a77f27f1 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -80,8 +80,6 @@ namespace dbaui // detach from the container void detach(); - // is the object valid? - bool isValid() const { return m_xIndexes.is(); } // number of contained indexes sal_Int32 size() const { return m_aIndexes.size(); } diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 1519113fc344..454f1f8c97c3 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -51,10 +51,8 @@ namespace dbaui DbaIndexList(vcl::Window* _pParent, WinBits nWinBits); void SetSelectHdl(const Link<DbaIndexList&,void>& _rHdl) { m_aSelectHdl = _rHdl; } - Link<DbaIndexList&,void> GetSelectHdl() const { return m_aSelectHdl; } void SetEndEditHdl(const Link<SvTreeListEntry*,bool>& _rHdl) { m_aEndEditHdl = _rHdl; } - Link<SvTreeListEntry*,bool> GetEndEditHdl() const { return m_aEndEditHdl; } virtual bool Select(SvTreeListEntry* pEntry, bool bSelect) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index bb4d2421f987..53229d06ed56 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -47,7 +47,7 @@ namespace dbaui OUString m_sDescendingText; sal_Int32 m_nMaxColumnsInIndex; - bool m_bAddIndexAppendix; + bool m_bAddIndexAppendix; public: IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); @@ -66,7 +66,6 @@ namespace dbaui void SaveValue() { m_aSavedValue = m_aFields; } void SetModifyHdl(const Link<>& _rHdl) { m_aModifyHdl = _rHdl; } - Link<> GetModifyHdl() const { return m_aModifyHdl; } virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const SAL_OVERRIDE; protected: diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index fc310a3b682d..0c8c49f7462b 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -42,9 +42,6 @@ namespace dbaui virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; - - css::uno::Reference< css::beans::XPropertySet > - getPropertySet() const { return m_xSet; } }; } // namespace dbaui diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index b74e985a766e..9b06ff02a60d 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -54,10 +54,6 @@ namespace pcr /// sets a ControlHelper instance which some functionality is delegated to inline virtual void setControlHelper( ControlHelper& _rControlHelper ); - - protected: - // Window overridables - inline virtual bool PreNotify( NotifyEvent& rNEvt ); }; @@ -230,15 +226,6 @@ namespace pcr } - template< class WINDOW > - inline bool ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt ) - { - if ( m_pHelper && m_pHelper->handlePreNotify( rNEvt ) ) - return true; - return WindowType::PreNotify( rNEvt ); - } - - //= CommonBehaviourControl - implementation diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 7345543ffd5e..a5940fd71e0a 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -64,36 +64,9 @@ namespace pcr } void SetModifyHdl( const Link<>& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); } - - protected: - bool PreNotify( NotifyEvent& _rNEvt ); }; - template< class LISTBOX_WINDOW > - bool ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt ) - { - if ( _rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - const ::KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); - if ( ( pKeyEvent->GetKeyCode().GetModifier() == 0 ) - && ( ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEUP ) - || ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEDOWN ) - ) - ) - { - if ( !ListBoxType::IsInDropDown() ) - { - // don't give the base class a chance to consume the event, in the property browser, it is - // intended to scroll the complete property page - return ListBoxType::GetParent()->PreNotify( _rNEvt ); - } - } - } - return ListBoxType::PreNotify( _rNEvt ); - } - - //= OTimeControl typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< TimeField > > OTimeControl_Base; diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 403aaf4b9c99..985d331acf0f 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -87,17 +87,6 @@ ResourceIndexAccess::ResourceIndexAccess(Sequence<Any> const& rArgs, Reference<X : m_pResMgr(GetResMgr(rArgs)) {}; -Reference<XInterface> initResourceIndexAccess(ResourceIndexAccess* pResourceIndexAccess) -{ - Reference<XInterface> xResult(static_cast<cppu::OWeakObject*>(pResourceIndexAccess)); - if(!pResourceIndexAccess->hasElements()) - // xResult does not help the client to analyse the problem - // and will crash on getByIndex calls, better just give back an empty Reference - // so that such ResourceStringIndexAccess instances are never release into the wild - throw RuntimeException("resource manager could not get initialized"); - return xResult; -} - Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 97a6a49c361f..2eabc8460b35 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -50,7 +50,5 @@ namespace extensions { namespace resource }; }} -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> initResourceIndexAccess(::extensions::resource::ResourceIndexAccess*); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 1d941b4a8a09..6d05221c9e8f 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -144,8 +144,6 @@ class CGM bool IsFinished() const { return mbIsFinished; }; bool Write( SvStream& rIStm ); - friend SvStream& ReadCGM( SvStream& rOStm, CGM& rCGM ); - }; #endif diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index d373600aa151..6c7c75d10dc2 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -50,12 +50,6 @@ namespace frm { } - // still waiting to be overwritten - virtual bool implTypedNotify( - const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener, - const EventClass& _rEvent - ) = 0; - public: inline bool notify() { diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 6e82ed70d05d..ff5f07e1a467 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -140,8 +140,6 @@ class CheckedIterator If you step to next element again; we set it to E_AFTEREND. So you have a chance to differ between "exact end" and "after end"! - @seealso method isEnd() - @seealso method isAfterEnd() @return A reference to our changed object himself. *//*-*****************************************************************************************************/ @@ -171,50 +169,6 @@ class CheckedIterator } /*-**************************************************************************************************** - @short return true if internal iterator was not initialized before - @descr These will be true, if use start a new search by using these iterator mechanism! - - @seealso class FilterCache - @return True if internalk state E_UNKNOWN - false otherwise. - *//*-*****************************************************************************************************/ - - inline bool isUninitialized() - { - return( m_eEndState == E_UNKNOWN ); - } - - /*-**************************************************************************************************** - @short return true if internal iterator reached end of container - @descr These will be true if you step to the end of internal container. - - @seealso method isAfterEnd() - @return True if end reached; false otherwise. - *//*-*****************************************************************************************************/ - - inline bool isEnd() - { - // Is true if one end state is set! - return ( - ( m_eEndState == E_END ) || - ( m_eEndState == E_AFTEREND ) - ); - } - - /*-**************************************************************************************************** - @short return true if you call operator++ again and end already reached - @descr These indicate, that end already reached but you call operator++ again and again! - - @seealso method isEnd() - @return True if end multiple reached; false otherwise. - *//*-*****************************************************************************************************/ - - inline bool isAfterEnd() - { - // Is true only, if special end state is set! - return( m_eEndState == E_AFTEREND ); - } - - /*-**************************************************************************************************** @short support readonly access to container entry @descr Use it to get the value of current container item. @return A reference to value of container entry. diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index c42d48eecbca..3006fea468bd 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -84,7 +84,6 @@ namespace MenuBarMerger const ::std::vector< OUString >& rReferencePath, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - bool ProcessFallbackOperation(); bool MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 9d66e4b4f919..dbb017661176 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -69,7 +69,6 @@ bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun:: bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ); void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xThis, const ::com::sun::star::uno::Reference< css::ui::XUIElement >& xUIElement ); -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const css::uno::Reference< ::com::sun::star::awt::XToolkit2 >& rToolkit, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent ); } diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h index 42e84ec464aa..6ede0ea2e39f 100644 --- a/hwpfilter/source/drawing.h +++ b/hwpfilter/source/drawing.h @@ -89,41 +89,6 @@ static HMemIODev *hmem = 0; static int count = 0; -inline bool HAVE_FCOLOR(HWPDrawingObject * hdo) -{ - return hdo->property.fill_color != HWPDO_COLOR_NONE; -} - - -inline bool HAVE_PATTERN(HWPDrawingObject * hdo) -{ - return (hdo->property.pattern_type & HWPDO_PAT_TYPE_BITS) - != HWPDO_PAT_SOLID && hdo->property.pattern_color != HWPDO_COLOR_NONE; -} - - -inline bool HAVE_GRADATION(HWPDrawingObject * hdo) -{ - return hdo->property.gstyle > BEGIN_GRADATION && - hdo->property.gstyle < END_GRADATION && - hdo->property.fromcolor != HWPDO_COLOR_NONE && - hdo->property.tocolor != HWPDO_COLOR_NONE; -} - - -inline bool HAVE_BITMAP_PATTERN(HWPDrawingObject * hdo) -{ - return hdo->property.gstyle == BITMAP_PATTERN && - hdo->property.szPatternFile[0]; -} - - -inline bool HAS_PAT(HWPDrawingObject * hdo) -{ - return HAVE_FCOLOR(hdo) || HAVE_PATTERN(hdo) || - HAVE_GRADATION(hdo) || HAVE_BITMAP_PATTERN(hdo); -} - static void SetHdoParallRgn(HWPDrawingObject * hdo, int width, int height) { hdo->property.parall.pt[0].x = 0; diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 6c552e86c499..40e990af6442 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -57,7 +57,6 @@ public: operator bool() const { return nVal; } bool IsSet() const { return bSet; } - friend SvStream& WriteSvBOOL(SvStream &, const SvBOOL &); friend SvStream& operator >> (SvStream &, SvBOOL &); bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); @@ -106,7 +105,6 @@ public: { return !m_aStr.isEmpty(); } - friend SvStream& WriteSvString(SvStream &, const SvString &); friend SvStream& operator >> (SvStream &, SvString &); bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); @@ -152,7 +150,6 @@ public: sal_uInt16 GetMajorVersion() const { return nMajorVersion; } sal_uInt16 GetMinorVersion() const { return nMinorVersion; } - friend SvStream& WriteSvVersion(SvStream &, const SvVersion &); friend SvStream& operator >> (SvStream &, SvVersion &); bool ReadSvIdl( SvTokenStream & rInStm ); }; diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 3f49ece0855c..b74824494528 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -141,13 +141,9 @@ HASH_INLINE(interface) HASH_INLINE(in) HASH_INLINE(out) HASH_INLINE(inout) -HASH_INLINE(String) -HASH_INLINE(UCHAR) -HASH_INLINE(USHORT) HASH_INLINE(uuid) HASH_INLINE(HelpContext) HASH_INLINE(HelpText) -HASH_INLINE(void) HASH_INLINE(shell) HASH_INLINE(Get) HASH_INLINE(Set) @@ -175,7 +171,6 @@ HASH_INLINE(char) HASH_INLINE(BYTE) HASH_INLINE(item) HASH_INLINE(PseudoSlots) -HASH_INLINE(map) HASH_INLINE(Default) HASH_INLINE(HelpFile) HASH_INLINE(Version) @@ -183,7 +178,6 @@ HASH_INLINE(import) HASH_INLINE(SlotIdFile) HASH_INLINE(SvName) HASH_INLINE(SbxName) -HASH_INLINE(ItemName) HASH_INLINE(OdlName) HASH_INLINE(include) HASH_INLINE(ExecMethod) diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index c2cc6c5c11ac..06a79b6f8df4 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -57,14 +57,6 @@ static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, return false; } -SvStream& WriteSvBOOL(SvStream & rStm, const SvBOOL & rb ) -{ - sal_uInt8 n = int(rb.nVal); - if( rb.bSet ) - n |= 0x02; - rStm.WriteUChar( n ); - return rStm; -} SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) { sal_uInt8 n; @@ -79,27 +71,6 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) return rStm; } -SvStream& WriteSvVersion(SvStream & rStm, const SvVersion & r ) -{ - if( (r.GetMajorVersion() || r.GetMinorVersion()) - && r.GetMajorVersion() <= 0x0F && r.GetMinorVersion() <= 0x0F ) - { // compress version number in 1 byte - // format first 4 bit for major, then 4 bit for minor - // 0.0 gets not compressed - - int n = r.GetMajorVersion() << 4; - n |= r.GetMinorVersion(); - rStm.WriteUChar( n ); - } - else - { - rStm.WriteUChar( 0 ); - rStm.WriteUInt16( r.GetMajorVersion() ); - rStm.WriteUInt16( r.GetMinorVersion() ); - } - return rStm; -} - SvStream& operator >> (SvStream & rStm, SvVersion & r ) { sal_uInt8 n; @@ -252,12 +223,6 @@ bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) return false; } -SvStream& WriteSvString(SvStream & rStm, const SvString & r ) -{ - write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, r.getString()); - return rStm; -} - SvStream& operator >> (SvStream & rStm, SvString & r ) { r.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm)); diff --git a/include/basebmp/colortraits.hxx b/include/basebmp/colortraits.hxx index 0b0c4921f234..d9b43320a58b 100644 --- a/include/basebmp/colortraits.hxx +++ b/include/basebmp/colortraits.hxx @@ -119,13 +119,6 @@ template< typename ColorType > struct ColorTraits /// Type of a color component (i.e. the type of an individual channel) typedef ColorType component_type; - /// Calculate normalized distance between color c1 and c2 - static inline vigra::NormTraits<ColorType> distance( ColorType c1, - ColorType c2 ) - { - return vigra::norm(c1 - c2); - } - static inline component_type toGreyscale( ColorType c ) { return c; diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index 226462fad992..8ca6bd7eccfd 100644 --- a/include/comphelper/configuration.hxx +++ b/include/comphelper/configuration.hxx @@ -242,14 +242,6 @@ private: /// to access each given localized configuration property. template< typename T, typename U > struct ConfigurationLocalizedProperty { - /// Get the read-only status of the given localized configuration property. - static bool isReadOnly( - css::uno::Reference<css::uno::XComponentContext> const & context - = comphelper::getProcessComponentContext()) - { - return detail::ConfigurationWrapper::get(context).isReadOnly(T::path()); - } - /// Get the value of the given localized configuration property, for the /// locale currently set at the /// com.sun.star.configuration.theDefaultProvider. diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx index a1ffba09cdf9..5ea8bb7ba242 100644 --- a/include/comphelper/optional.hxx +++ b/include/comphelper/optional.hxx @@ -42,38 +42,6 @@ inline ::boost::optional<T> make_optional( return ::boost::optional<T>(); } -template <typename T> -inline ::com::sun::star::beans::Optional<T> makeOptional( T const& v ) -{ -// CPPU_IS_CPP_MAPPING_OF_NON_VOID_UNO_TYPE(T); - return ::com::sun::star::beans::Optional<T>(true, v); -} - -template <typename T> -inline ::com::sun::star::beans::Optional<T> makeOptional( - ::boost::optional<T> const& o ) -{ -// CPPU_IS_CPP_MAPPING_OF_NON_VOID_UNO_TYPE(T); - if (o) - return ::com::sun::star::beans::Optional<T>(true, *o); - else - return ::com::sun::star::beans::Optional<T>(); -} - -inline ::com::sun::star::beans::Optional<sal_Bool> makeOptional( - ::boost::optional<bool> const& o ) -{ - if (o) - return ::com::sun::star::beans::Optional<sal_Bool>(true, *o); - else - return ::com::sun::star::beans::Optional<sal_Bool>(); -} - -inline ::com::sun::star::beans::Optional<sal_Bool> makeOptional( bool v ) -{ - return ::com::sun::star::beans::Optional<sal_Bool>(true, v); -} - } // namespace comphelper #endif // ! defined(INCLUDED_COMPHELPER_OPTIONAL_HXX) diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx index 3c6ed20e4802..a7ad8375e00b 100644 --- a/include/dbaccess/ToolBoxHelper.hxx +++ b/include/dbaccess/ToolBoxHelper.hxx @@ -64,8 +64,6 @@ namespace dbaui */ void setToolBox(ToolBox* _pTB); - inline ToolBox* getToolBox() const { return m_pToolBox; } - /** checks if the toolbox needs a new imagelist. */ void checkImageList(); diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index b6142e6627ca..15403a2fe299 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -46,7 +46,6 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface bool bLastCenter : 1; bool bLastBlock : 1; - friend SvStream& WriteSvxAdjustItem( SvStream&, SvxAdjustItem& ); //$ ostream public: TYPEINFO_OVERRIDE(); diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index e3b8b05787e1..d26946e9d23b 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -40,8 +40,6 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem sal_uInt8 nMinTrail; sal_uInt8 nMaxHyphens; - friend SvStream & WriteSvxHyphenZoneItem( SvStream & aS, SvxHyphenZoneItem & ); - public: TYPEINFO_OVERRIDE(); diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index b493a6f1b6df..61ba35bf2a7e 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -34,8 +34,6 @@ class SvXMLUnitConverter; #define LINE_SPACE_DEFAULT_HEIGHT 200 class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface { - friend SvStream& WriteSvxLineSpacingItem( SvStream&, SvxLineSpacingItem& ); //$ ostream - short nInterLineSpace; sal_uInt16 nLineHeight; sal_uInt16 nPropLineSpace; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index ff523a3134a3..da731daabf71 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -33,7 +33,6 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem { - friend SvStream & WriteSvxOrphansItem( SvStream & aS, SvxOrphansItem & ); public: TYPEINFO_OVERRIDE(); diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 41b4d56de32f..ae57bd581373 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -41,8 +41,6 @@ private: mutable sal_Unicode m_cDecimal; sal_Unicode cFill; - EDITENG_DLLPRIVATE friend SvStream& WriteSvxTabStop( SvStream&, SvxTabStop& ); - void fillDecimal() const; public: diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index b6d3bffce230..6ff21382407c 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -33,7 +33,6 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem { - friend SvStream & WriteSvxWidowsItem( SvStream & aS, SvxWidowsItem & ); public: TYPEINFO_OVERRIDE(); diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 42328e01127c..566527506b23 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -181,7 +181,6 @@ struct SvxMSDffConnectorRule , pCObj( NULL ) {}; - friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); }; struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index e0a09895a0c5..a1a8d541fe27 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -283,17 +283,6 @@ public: static ::com::sun::star::uno::Sequence< typename VectorType::value_type > vectorToSequence( const VectorType& rVector ); - /** Creates a UNO sequence from a std::map with copies of all elements. - - @param rMap The map to be converted to a sequence. - - @return A com.sun.star.uno.Sequence object with copies of all objects - contained in the passed map. - */ - template< typename MapType > - static ::com::sun::star::uno::Sequence< typename MapType::mapped_type > - mapToSequence( const MapType& rMap ); - /** Creates a UNO sequence of sequences from a matrix with copies of all elements. @param rMatrix The matrix to be converted to a sequence of sequences. @@ -370,19 +359,6 @@ template< typename VectorType > return ::com::sun::star::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); } -template< typename MapType > -/*static*/ ::com::sun::star::uno::Sequence< typename MapType::mapped_type > ContainerHelper::mapToSequence( const MapType& rMap ) -{ - typedef typename MapType::mapped_type ValueType; - if( rMap.empty() ) - return ::com::sun::star::uno::Sequence< ValueType >(); - ::com::sun::star::uno::Sequence< ValueType > aSeq( static_cast< sal_Int32 >( rMap.size() ) ); - sal_Int32 nIndex = 0; - for( typename MapType::const_iterator aIt = rMap.begin(), aEnd = rMap.end(); aIt != aEnd; ++aIt, ++nIndex ) - aSeq[ nIndex ] = *aIt; - return aSeq; -} - template< typename MatrixType > /*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix ) { diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index c5b13d5c9a2e..b98d961e203f 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -46,13 +46,6 @@ public: typedef typename container_type::size_type size_type; public: - /** Returns true, if the object with the passed index exists. Returns - false, if the vector element exists but is an empty reference. */ - bool has( sal_Int32 nIndex ) const - { - const value_type* pxRef = getRef( nIndex ); - return pxRef && pxRef->get(); - } /** Returns a reference to the object with the passed index, or 0 on error. */ value_type get( sal_Int32 nIndex ) const diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index a91f9dbd41b6..10502c12c7e6 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -42,7 +42,6 @@ public: FileList& operator=( const FileList& rFileList ); // Im-/Export - SOT_DLLPUBLIC friend SvStream& WriteFileList( SvStream& rOStm, const FileList& rFileList ); SOT_DLLPUBLIC friend SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList ); // Liste fuellen/abfragen diff --git a/include/store/store.hxx b/include/store/store.hxx index 943b73ccd570..d9edcf371a6a 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -86,14 +86,6 @@ public: return m_hImpl; } - /** Check for a valid Stream Handle. - @return sal_True if valid, sal_False otherwise. - */ - inline bool isValid() const - { - return (m_hImpl != 0); - } - /** Open the stream. @see store_openStream() */ @@ -251,14 +243,6 @@ public: return m_hImpl; } - /** Check for a valid Directory Handle. - @return sal_True if valid, sal_False otherwise. - */ - inline bool isValid() const - { - return (m_hImpl != 0); - } - /** Open the directory. @see store_openDirectory() */ diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 7e73dc86a009..c1b79e0ddf58 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -236,8 +236,6 @@ public: sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero); ~NfCurrencyEntry() {} - inline NfCurrencyEntry* Clone() const; - /// Symbols and language identical bool operator==( const NfCurrencyEntry& r ) const; @@ -297,17 +295,6 @@ NfCurrencyEntry::NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankS { } -NfCurrencyEntry* NfCurrencyEntry::Clone() const -{ - return new NfCurrencyEntry( - aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat, nDigits, cZeroChar); -} - -inline NfCurrencyEntry* new_clone( const NfCurrencyEntry& r ) -{ - return r.Clone(); -} - typedef std::vector< OUString > NfWSStringsDtor; class SvNumberFormatterRegistry_Impl; diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 66ddf499b229..15484c717cdc 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -39,7 +39,6 @@ public: // get & set config entries bool GetIsForPagePreviews() const; - bool GetIsHelpTipsDisappear() const; bool GetIsAllowAnimatedGraphics() const; bool GetIsAllowAnimatedText() const; bool GetIsAutomaticFontColor() const; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index c72e0ee522a9..6e4999a03c3a 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -488,9 +488,6 @@ public: void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); - friend SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj ); - friend SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ); - static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL ); // will inspect an object ( e.g. a control ) for any 'ImageURL' // properties and return these in a vector. Note: this implementation diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx index 7d5de1d7bc04..1d8aebc06d6c 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrtextattribute.hxx @@ -110,7 +110,6 @@ namespace drawinglayer SdrTextHorzAdjust getSdrTextHorzAdjust() const; SdrTextVertAdjust getSdrTextVertAdjust() const; - bool isToBeChained() const; bool isChainable() const; diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index c417c4980e21..3652b59b4e0c 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -90,9 +90,6 @@ public: void operator&=(const SetOfByte& r2ndSet); void operator|=(const SetOfByte& r2ndSet); - friend inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet); - friend inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet); - // initialize this set with a uno sequence of sal_Int8 void PutValue(const com::sun::star::uno::Any & rAny); @@ -100,18 +97,6 @@ public: void QueryValue(com::sun::star::uno::Any & rAny) const; }; -inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet) -{ - rOut.Write(rSet.aData, 32); - return rOut; -} - -inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet) -{ - rIn.Read(rSet.aData, 32); - return rIn; -} - #endif // INCLUDED_SVX_SVDSOB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index c6845e51976c..53351d1da354 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -85,8 +85,6 @@ enum SdrObjListKind {SDROBJLIST_UNKNOWN =0x00, // Here is space for 8 more types of pages }; // reserved for Surrogate -inline bool SdrIsPageKind(SdrObjListKind eK) { return eK>=SDROBJLIST_DRAWPAGE && eK<=0x1A; } - /* * Repeat */ diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx index f0b8f5b33eff..ddb651a8516e 100644 --- a/include/svx/textchainflow.hxx +++ b/include/svx/textchainflow.hxx @@ -49,10 +49,6 @@ public: bool IsUnderflow() const; SdrTextObj *GetLinkTarget() const; - SdrTextObj *GetNextLink() const; - - OFlowChainedText *GetOverflowChainedText() const; - UFlowChainedText *GetUnderflowChainedText() const; protected: // Cursor related diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 1d4fd75efe23..4ea4549f7c8b 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -55,11 +55,6 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDraw SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage ) throw() ; /** - * Returns the SvxNumBulletItem with the given name from the pool or a null if there is no item with that name - */ -SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& aName ) throw(); - -/** * Maps the vcl MapUnit enum to a API constant MeasureUnit. * Returns false if conversion is not supported. */ diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 4bf6dbd71ff1..9d22c4234c39 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -178,7 +178,6 @@ public: // Objects maintain their IDs while storing and loading to/from stream friend SvStream& operator >> ( SvStream &, SvPersistStream & ); - friend SvStream& WriteSvPersistStream( SvStream &, SvPersistStream & ); }; #endif diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index 9a39134f6d26..04df770fbaf8 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -193,9 +193,7 @@ namespace utl */ void reset( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode = TakeOwnership ); - inline bool set( ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_Query _query ); inline bool set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ); - inline bool set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_Query _query ); inline void set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); inline void set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); @@ -308,26 +306,12 @@ namespace utl } template < class INTERFACE, class COMPONENT > - bool SharedUNOComponent< INTERFACE, COMPONENT >::set( ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_Query _query ) - { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _query ) ); - return is(); - } - - template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _query ) ); return is(); } - template < class INTERFACE, class COMPONENT > - bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_Query _query ) - { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _rAny, _query ) ); - return is(); - } - } // namespace utl #endif // INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index ddd7c87a2bc7..079ff9e4e1a2 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -66,13 +66,6 @@ bool VCL_DLLPUBLIC WriteDIBBitmapEx( const BitmapEx& rSource, SvStream& rOStm); -bool VCL_DLLPUBLIC WriteDIBV5( - const Bitmap& rSource, - const Bitmap& rSourceAlpha, - SvStream& rOStm); - - - #endif // INCLUDED_VCL_DIBTOOLS_HXX diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 9809ca60e58e..6f5c46ecbc39 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -210,30 +210,6 @@ public: bool GetUseCanvas() const { return bUseCanvas; } }; -/** Create a special metaaction that delegates rendering to specified - service. - - This factory function creates a MetaCommentAction that delegates - rendering to the specified services, once played back in the - metafile. - - @param rRendererServiceName - Renderer service. Gets an awt::XGraphic on instantiation - - @param rGraphicServiceName - Graphic service. Gets the raw data on instantiation - - @param pData - Raw data. Gets copied - - @param nDataSize - Length, in byte, of raw data - */ -MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, - const OUString& rGraphicServiceName, - const void* pData, - sal_uInt32 nDataSize ); - #endif // INCLUDED_VCL_GDIMTF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 005c146ef14b..318064bbf3b0 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -172,7 +172,6 @@ class VCL_DLLPUBLIC GraphicDescriptor bool ImpDetectSGV( SvStream& rStm, bool bExtendedInfo ); bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo ); bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectMOV( SvStream& rStm, bool bExtendedInfo ); GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; @@ -216,9 +215,6 @@ public: /** return number of planes or 0 */ sal_uInt16 GetPlanes() const { return nPlanes; } - /** @return true if the graphic is compressed */ - bool IsCompressed() const { return bCompressed; } - /** @return filter number that is needed by the GraphFilter to read this format */ static OUString GetImportFormatShortName( GraphicFileFormat nFormat ); }; @@ -270,7 +266,6 @@ public: OUString GetImportFormatShortName( sal_uInt16 nFormat ); static OUString GetImportOSFileType( sal_uInt16 nFormat ); OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); - bool IsImportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount(); sal_uInt16 GetExportFormatNumber( const OUString& rFormatName ); diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx index 49c4197958a2..34271cae690e 100644 --- a/include/vcl/helper.hxx +++ b/include/vcl/helper.hxx @@ -56,7 +56,6 @@ OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); } // namespace -bool VCL_DLLPUBLIC GetMenuInvalidateListeners(); #endif // INCLUDED_VCL_HELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 4f4f223018ec..d382f12cafe7 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -99,9 +99,6 @@ public: sal_uInt32 GetJobs() const { return mnJobs; } bool operator==( const QueueInfo& rInfo ) const; - - friend VCL_DLLPUBLIC SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ); - friend VCL_DLLPUBLIC SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ); }; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 939b9de2aaaa..837d7d2e1136 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -52,9 +52,6 @@ namespace vcl // doIt() completed long execute( const TimeValue& _rTimeout ) { return impl_execute( &_rTimeout ); } - public: - bool didTimeout() const { return m_bTimeout; } - private: long impl_execute( const TimeValue* _pTimeout ); }; diff --git a/include/xmloff/xmlreg.hxx b/include/xmloff/xmlreg.hxx deleted file mode 100644 index 73b97dad469f..000000000000 --- a/include/xmloff/xmlreg.hxx +++ /dev/null @@ -1,36 +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 INCLUDED_XMLOFF_XMLREG_HXX -#define INCLUDED_XMLOFF_XMLREG_HXX - -#include <rtl/ref.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -/** - * Register subset of UNO services from XML Office library. This is necessary when - * linking against the static "xol.lib". - * - * @return returns false if at least one component could not be registered. - */ -bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); /// [all] ServiceProvider to register in. - -#endif // INCLUDED_XMLOFF_XMLREG_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 057e2f4ac045..3e9bdef6d899 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -15,8 +15,6 @@ namespace opencl { ds_device getDeviceSelection(const char* pFileName, bool bForceSelection = false); -bool selectedDeviceIsOpenCL(ds_device device); -bool selectedDeviceIsNativeCPU(ds_device device); } diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index d634ea89af78..8be1183dc82f 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -294,8 +294,6 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ); com::sun::star::uno::Any PyEnum2Enum( PyObject *obj ) throw ( com::sun::star::uno::RuntimeException ); -bool PyBool2Bool( PyObject *o, const Runtime & r ) - throw ( com::sun::star::uno::RuntimeException ); sal_Unicode PyChar2Unicode( PyObject *o ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Type PyType2Type( PyObject * o ) diff --git a/registry/inc/regapi.hxx b/registry/inc/regapi.hxx index e784838b8c69..93fd05a072fa 100644 --- a/registry/inc/regapi.hxx +++ b/registry/inc/regapi.hxx @@ -379,14 +379,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName); -/** This function returns the access mode of the registry. - - @param hReg identifies a currently open registry. - @return TRUE if accessmode is read only else FALSE. -*/ -REG_DLLPUBLIC bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg); - - /** This function opens a registry with the specified name. @param registryName points to a null terminated string specifying the name of the registry. diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 0b2ec2a0696c..8ef134e5318e 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -539,15 +539,6 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) -// reg_isReadOnly - -bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) -{ - return isReadOnly(hRegistry); -} - - - // reg_openRegistry RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index b2ad7c483e87..91a46dce284e 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -41,8 +41,6 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN }; // Function Forwards OString GetTmpFileName(); -bool Append(const OString &rDestFile, const OString &rSourceFile); - bool Append(FILE * fDest, OString &raSourceFile); OString OutputFile(const OString &rInput, const char * ext); diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 45f29afe004a..51ce98ce5314 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -88,45 +88,6 @@ OString GetTmpFileName() return OUStringToOString( aTmpFile, RTL_TEXTENCODING_MS_1252 ); } -bool Append(FILE * fDest, const OString &rTmpFile) -{ -#define MAX_BUF 4096 - FILE *fSource = fopen(rTmpFile.getStr(), "rb"); - if( !fDest || !fSource ) - { - if( fSource ) - fclose( fSource ); - return false; - } - - bool bSuccess = true; - char szBuf[ MAX_BUF ]; - size_t nItems; - - do //append - { - nItems = fread( szBuf, 1, MAX_BUF, fSource ); - bSuccess = (nItems == fwrite(szBuf, 1, nItems, fDest)); - SAL_WARN_IF(!bSuccess, "rsc", "short write"); - } - while (MAX_BUF == nItems && bSuccess); - - fclose( fSource ); - return bSuccess; -} - -bool Append(const OString &rOutputSrs, const OString &rTmpFile) -{ - FILE * fDest = fopen(rOutputSrs.getStr(), "ab"); - - bool bRet = Append(fDest, rTmpFile); - - if( fDest ) - fclose( fDest ); - - return bRet; -} - /* replaces extension of a file name */ OString OutputFile(const OString &rInput, const char * pExt) { diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 0513dbaad0ea..71dcaa77ae40 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -230,7 +230,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType, const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); virtual bool ImplCreateMainNotes() SAL_OVERRIDE; - bool ImplCreateNotes( sal_uInt32 nPageNum ); void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); void ImplWriteVBA(); void ImplWriteOLE(); diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 99d84cd5bd47..7de91629c544 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -105,8 +105,6 @@ class PropValue : mXPropSet( rXPropSet ) {} - ::com::sun::star::uno::Any GetAny() { return mAny; } - static bool GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index ba450518a5c1..0d909f8dfc92 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -213,7 +213,6 @@ public: } public: - friend SvStream& ReadAnimationNode(SvStream& rIn, AnimationNode& rAtom); friend SvStream& WriteAnimationNode(SvStream& rOut, AnimationNode& rAtom); }; diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 0cc6df414eee..efcf9b89d61c 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -124,7 +124,6 @@ class ClientBox : public Control long GetTotalHeight() const; void SetupScrollBar(); void DrawRow(vcl::RenderContext& rRenderContext, const Rectangle& rRect, const TClientBoxEntry& rEntry); - bool HandleTabKey( bool bReverse ); bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); @@ -151,7 +150,6 @@ public: long GetActiveEntryIndex(); long GetEntryCount() { return (long) m_vEntries.size(); } Rectangle GetEntryRect( const long nPos ) const; - bool HasActive() { return m_bHasActive; } long PointToPos( const Point& rPos ); void DoScroll( long nDelta ); void RecalcAll(); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 6b9705bfc073..81c600065ecb 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -92,9 +92,8 @@ public: SdUnoSearchReplaceDescriptor(bool bReplace) throw (css::uno::RuntimeException); virtual ~SdUnoSearchReplaceDescriptor() throw(); - bool IsBackwards() const throw() { return mbBackwards; } - bool IsCaseSensitive() const throw() { return mbCaseSensitive; } - bool IsWords() const throw() { return mbWords; } + bool IsCaseSensitive() const { return mbCaseSensitive; } + bool IsWords() const { return mbWords; } UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 8adba5afe608..5ec8ae052566 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -63,7 +63,6 @@ private: bool IsMasterDepend() const throw(); void SetMasterDepend( bool bDepend ) throw(); - SdrObject* GetSdrObject() const throw(); OUString GetPlaceholderText() const; com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 80ae479b1601..adb3c32987be 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -60,17 +60,6 @@ FileList& FileList::operator=( const FileList& rFileList ) |* \******************************************************************************/ -/* - * NOTE: to correctly handle this Protocol with Unicode, native Win32 must be called: - * e.g. DropQueryFile - */ - -SvStream& WriteFileList( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& ) -{ - OSL_FAIL("TODO: Not implemented!"); - return rOStm; -} - /* #i28176# The Windows clipboard bridge now provides a double '\0' terminated list of file names for format SotClipboardFormatId::FILE_LIST diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index 5a2c4cf34154..3bfb878b72ae 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -77,12 +77,6 @@ public: @param rValue a value */ inline void setValue( const t_Key & rKey, const t_Val & rValue ); - /** Tests whether a value is cached for given key. - <br> - @param rKey a key - @return true, if value is cached - */ - inline bool hasValue( const t_Key & rKey ) const; /** Clears the cache, thus releasing all cached elements and keys. <br> */ @@ -142,14 +136,6 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash >::toFront( CacheEntry * pEntry ) } template< class t_Key, class t_Val, class t_KeyHash > -inline bool LRU_Cache< t_Key, t_Val, t_KeyHash >::hasValue( const t_Key & rKey ) const -{ - ::osl::MutexGuard aGuard( _aCacheMutex ); - const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); - return (iFind != _aKey2Element.end()); -} - -template< class t_Key, class t_Val, class t_KeyHash > inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash >::getValue( const t_Key & rKey ) const { ::osl::MutexGuard aGuard( _aCacheMutex ); diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 11d3dc5dc341..4de0d00aa485 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -45,8 +45,6 @@ namespace jvmaccess { namespace stoc_javavm { -bool configureJava(const css::uno::Reference< - css::uno::XComponentContext>& xContext); // The MS compiler needs a typedef here, so the JavaVirtualMachine ctor can call // its base class ctor: typedef diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index 3ecf9905f251..197f395ff6e3 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -82,13 +82,6 @@ public: */ inline void set( t_key const & key, t_val const & val ); - /** Tests whether a value is cached for given key. - - @param key a key - @return true, if value is cached - */ - inline bool has( t_key const & key ) const; - /** Clears the cache, releasing all cached elements and keys. */ inline void clear(); @@ -171,14 +164,6 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::toFront( } template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > -inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( - t_key const & key ) const -{ - typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); - return (iFind != m_key2element.end()); -} - -template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey > inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( t_key const & key ) const { diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 73f2f7702464..fadb86bd30b6 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -655,13 +655,6 @@ public: return (m_xPage.get() != 0); } - static PageHolderObject<T> createInstance (rtl::Reference< PageData::Allocator > const & rxAllocator) - { - PageHolderObject<T> tmp; - (void) tmp.construct (rxAllocator); - return tmp; - } - explicit PageHolderObject (PageHolder const & rxPage = PageHolder()) : m_xPage (rxPage) {} diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 5d3f9718cac3..c083ffce71a0 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -617,10 +617,6 @@ bool SvtAccessibilityOptions::GetIsForPagePreviews() const { return sm_pSingleImplConfig->GetIsForPagePreviews(); } -bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const -{ - return sm_pSingleImplConfig->GetIsHelpTipsDisappear(); -} bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const { return sm_pSingleImplConfig->GetIsAllowAnimatedGraphics(); diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index 3dbd6d83d2ec..b4a72eb4004d 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.cxx @@ -20,44 +20,6 @@ #include "mcvmath.hxx" - -// die folgenden Tabellen enthalten sin(phi) * 2**14 -// fuer phi= 360Grad*2**-32 bis 360 Grad -// def. fuer x: phi=360Grad * 2**(x-16) -// d.h. x = 16 -> 360 Grad -// x = -16 -> (2**-16) * 360 Grad -// x: -16 ... 0 ... 15 -//x= 0, 1, 2, 3, 4, 5, 6, 7, -// 8, 9, 10, 11, 12, 13, 14, 15 - -static const short CosTab[16] = -{ - 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16383, - 16379, 16364, 16305, 16069, 15137, 11585, 0, -16383 -}; -static const short SinTab[16]= -{ - 2, 3, 6, 13, 25, 50, 101, 201, - 402, 804, 1606, 3196, 6270, 11585, 16384, 0 -}; - -/************************************************************************** -|* -|* ImpMultBig2() -|* -|* Description Multiplier for FixPoint-calculations -|* -**************************************************************************/ - -// first parameter should be the larger one - -Fix ImpMultBig2( const Fix& a, const Fix& b ) -{ - Fix f; - f.x = (((b.x+FIX_A2)>>FIX_P2)*a.x+FIX_A3)>>FIX_P3; - return f; -} - /************************************************************************** |* |* ImpSqrt() @@ -88,34 +50,4 @@ sal_uInt16 ImpSqrt( sal_uLong nRadi ) return sal::static_int_cast< sal_uInt16 >(sqr); } -/************************************************************************** -|* -|* ImpExPI() -|* -|* Description EXPI funktion or FixPoint-calculations -|* -**************************************************************************/ - -// e**(i*nPhi), unit nPhi: 2**16 == 360 degrees - -FixCpx ImpExPI( sal_uInt16 nPhi ) -{ - short i; - FixCpx aIter(Fix(1L)); // e**(0*i) - FixCpx Mul; - const char Sft=14-FIX_POST; - - for ( i = 15; i >= 0; i-- ) - { - if ( (1L<<i) & nPhi ) - { - Mul.r.x = CosTab[i]>>Sft; // e**(i(phi1+phi2)) = - Mul.i.x = SinTab[i]>>Sft; // e**(i*phi1)) * e**(i*phi2)) - aIter *= Mul; - } - } - - return aIter; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx index 480980462e32..2e84f5165558 100644 --- a/svtools/source/dialogs/mcvmath.hxx +++ b/svtools/source/dialogs/mcvmath.hxx @@ -189,10 +189,7 @@ inline FixCpx operator/ ( const FixCpx& a, const FixCpx& b ) -Fix ImpMultBig2( const Fix& a, const Fix& b ); - sal_uInt16 ImpSqrt( sal_uLong nRadi ); -FixCpx ImpExPI( sal_uInt16 nPhi ); #endif // INCLUDED_SVTOOLS_SOURCE_DIALOGS_MCVMATH_HXX diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index e6fbd3f3024d..a1f1015b644b 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1083,48 +1083,6 @@ IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) mpSwapOutTimer->Start(); } -SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) -{ - VersionCompat aCompat( rIStm, StreamMode::READ ); - Graphic aGraphic; - GraphicAttr aAttr; - bool bLink; - - ReadGraphic( rIStm, aGraphic ); - ReadGraphicAttr( rIStm, aAttr ); - rIStm.ReadCharAsBool( bLink ); - - rGraphicObj.SetGraphic( aGraphic ); - rGraphicObj.SetAttr( aAttr ); - - if( bLink ) - { - OUString aLink = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); - rGraphicObj.SetLink(aLink); - } - else - rGraphicObj.SetLink(); - - rGraphicObj.SetSwapStreamHdl(); - - return rIStm; -} - -SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj ) -{ - VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 ); - const bool bLink = rGraphicObj.HasLink(); - - WriteGraphic( rOStm, rGraphicObj.GetGraphic() ); - WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() ); - rOStm.WriteBool( bLink ); - - if( bLink ) - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); - - return rOStm; -} - #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL ) diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 8145532dba84..538dbfcab34d 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -737,19 +737,8 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo { const Bitmap aBitmap(rBitmapEx.GetBitmap()); - // #i124085# take out DIBV5 for writing to the clipboard - //if(rBitmapEx.IsTransparent()) - //{ - // const Bitmap aMask(rBitmapEx.GetAlpha().GetBitmap()); - - // // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True - // WriteDIBV5(aBitmap, aMask, aMemStm); - //} - //else - //{ - // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True - WriteDIB(aBitmap, aMemStm, false, true); - //} + // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True + WriteDIB(aBitmap, aMemStm, false, true); } maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index cefefb19e775..2ad56ce44172 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -358,11 +358,6 @@ namespace drawinglayer return mpSdrTextAttribute->isInEditMode(); } - bool SdrTextAttribute::isToBeChained() const - { - return mpSdrTextAttribute->isToBeChained(); - } - bool SdrTextAttribute::isChainable() const { return mpSdrTextAttribute->isChainable(); diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index 248c1c4727b2..a433fcd37ee6 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -253,11 +253,6 @@ SdrTextObj *TextChainFlow::GetLinkTarget() const return mpTargetLink; } -SdrTextObj *TextChainFlow::GetNextLink() const -{ - return mpNextLink; -} - OutlinerParaObject *TextChainFlow::impGetMergedUnderflowParaObject(SdrOutliner *pOutliner) { return mpUnderflChText->CreateMergedUnderflowParaObject(pOutliner, mpNextLink->GetOutlinerParaObject()); @@ -268,17 +263,6 @@ TextChain *TextChainFlow::GetTextChain() const return mpTextChain; } -OFlowChainedText *TextChainFlow::GetOverflowChainedText() const -{ - return mpOverflChText; -} - -UFlowChainedText *TextChainFlow::GetUnderflowChainedText() const -{ - return mpUnderflChText; -} - - // EditingTextChainFlow EditingTextChainFlow::EditingTextChainFlow(SdrTextObj *pLinkTarget) : diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx index 67fe2249c415..42114dd2d81d 100644 --- a/svx/source/table/celltypes.hxx +++ b/svx/source/table/celltypes.hxx @@ -70,12 +70,6 @@ public: } } - /* returns true if the next call to next() will return true also. */ - bool hasNext() const - { - return maIter != maEnd; - } - /* iterates in the configured direction and returns true if rValue now contains a valid position in the range of this iterator */ bool next( T& rValue ) diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index c1861f57c9a2..a42ce1bb6069 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -38,10 +38,6 @@ class SwEndNoteInfo; class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient { - /** This "Doc"-function is made friend in order to be able - to set the auto-flag after copying!! */ - friend bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, - SwHistory* ); ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; /**< Points to the object in which the diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 80e43f868b7e..279423870900 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -340,7 +340,6 @@ public: {aMiscConfig.bShowIndexPreview = bSet; aMiscConfig.SetModified();} - bool IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} void SetDefaultFontInCurrDocOnly(bool bSet) { aMiscConfig.bDefaultFontsInCurrDocOnly = bSet; diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index cb5aa94c9165..d10cc0de8a33 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -112,8 +112,6 @@ public: { return nListTabStopPosition; } - - friend SvStream & WriteSwLineInfo( SvStream &rOS, const SwLineInfo &rInf ); }; class SwTextInfo @@ -136,8 +134,6 @@ public: SwParaPortion *GetParaPortion() { return m_pPara; } const SwParaPortion *GetParaPortion() const { return m_pPara; } sal_Int32 GetTextStart() const { return m_nTextStart; } - - friend SvStream & WriteSwTextInfo( SvStream &rOS, const SwTextInfo &rInf ); }; class SwTextSizeInfo : public SwTextInfo @@ -293,8 +289,6 @@ public: inline void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; } inline void SetText( const OUString &rNew ){ m_pText = &rNew; } - friend SvStream & WriteSwTextSizeInfo( SvStream &rOS, const SwTextSizeInfo &rInf ); - // No Bullets for the symbol font! inline bool IsNoSymbol() const { return RTL_TEXTENCODING_SYMBOL != m_pFnt->GetCharSet( m_pFnt->GetActual() ); } @@ -465,8 +459,6 @@ public: inline const SwRect &GetPaintRect() const { return aPaintRect; } - friend SvStream & WriteSwTextPaintInfo( SvStream &rOS, const SwTextPaintInfo &rInf ); - // STUFF FOR JUSTIFIED ALIGNMENT inline sal_uInt16 GetSpaceIdx() const { return nSpaceIdx; } @@ -690,8 +682,6 @@ public: // Return: Position; sets cHookChar if necessary sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd ); - friend SvStream & WriteSwTextFormatInfo( SvStream &rOS, const SwTextFormatInfo &rInf ); - inline void SetTabOverflow( bool bOverflow ) { bTabOverflow = bOverflow; } inline bool IsTabOverflow() { return bTabOverflow; } diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index e3c205360d0a..d25e2c80c0ba 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -37,7 +37,6 @@ class SwViewOption; class SwContentOptPage; class SwShdwCrsrOptionsTabPage; -SfxPrinter* GetPrt( SwViewShell* ); void SetPrt( SfxPrinter* ); // OS 12.01.95 diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 7cf42258ea80..ab0f95129d0f 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -572,32 +572,6 @@ SvPersistStream& operator >> return rStm.ReadPointer( rpObj ); } -SvStream& WriteSvPersistStream -( - SvStream & rStm, - SvPersistStream & rThis -) -{ - SvStream * pOldStm = rThis.GetStream(); - rThis.SetStream( &rStm ); - - sal_uInt8 bTmp = 0; - rThis.WriteUChar( bTmp ); // Version - sal_uInt32 nCount = (sal_uInt32)rThis.aPUIdx.Count(); - rThis.WriteUInt32( nCount ); - sal_uIntPtr aIndex = rThis.aPUIdx.FirstIndex(); - for( sal_uInt32 i = 0; i < nCount; i++ ) - { - SvPersistBase * pEle = rThis.aPUIdx.Get(aIndex); - sal_uInt8 nP = P_OBJ | P_ID | P_STD; - WriteId( rThis, nP, aIndex, pEle->GetClassId() ); - rThis.WriteObj( nP, pEle ); - aIndex = rThis.aPUIdx.NextIndex( aIndex ); - } - rThis.SetStream( pOldStm ); - return rStm; -} - SvStream& operator >> ( SvStream & rStm, diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index d1c68391d873..606423852bf6 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -449,8 +449,6 @@ public: const_iterator end() const; - bool empty() const; - size_type size() const; Val const * map(OUString const & rString, @@ -604,15 +602,6 @@ typename RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const } template< typename Val > -bool RegexpMap< Val >::empty() const -{ - return !m_pImpl->m_pDefault - && m_pImpl->m_aList[Regexp::KIND_PREFIX].empty() - && m_pImpl->m_aList[Regexp::KIND_AUTHORITY].empty() - && m_pImpl->m_aList[Regexp::KIND_DOMAIN].empty(); -} - -template< typename Val > typename RegexpMap< Val >::size_type RegexpMap< Val >::size() const { return (m_pImpl->m_pDefault ? 1 : 0) diff --git a/vcl/README.GDIMetaFile b/vcl/README.GDIMetaFile index bd263395aed2..d95a74a6ec87 100644 --- a/vcl/README.GDIMetaFile +++ b/vcl/README.GDIMetaFile @@ -108,19 +108,6 @@ COLOR ADJUSTMENT FUNCTIONS - GetMonochromeMtf -SPECIAL RENDERING FUNCTION - -- makePluggableRendererAction - Create a special meaaction that delegates - rendering to specified service. This factory - function creates a MetaCommentAction that - delegates rendering to the specified services, - once played back in the metafile. Takes a - renderer service name string that gets an - awt::XGraphic on instantiation, and a graphic - service name string that gets the raw data on - instantiation. - - Related classes --------------- diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index ff411a6448f4..1e4a31283431 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -158,13 +158,9 @@ private: public: ImplFTSFontData( FtFontInfo*, const ImplDevFontAttributes& ); - FtFontInfo* GetFtFontInfo() const { return mpFtFontInfo; } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplFTSFontData( *this ); } virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mpFtFontInfo->GetFontId(); } - - static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; #endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 2034bedd3f6a..221b99925c53 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -552,13 +552,6 @@ PrinterJob::EndJob() return bSuccess; } -bool -PrinterJob::AbortJob () -{ - m_pGraphics->OnEndJob(); - return false; -} - void PrinterJob::InitPaperSize (const JobData& rJobSetup) { diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index fd0d13a2096c..9d00e6057469 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -282,11 +282,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager // There may be multiple font ids for TrueType collections std::vector<fontID> findFontFileIDs( int nDirID, const OString& rFile ) const; - bool knownFontFile( int nDirID, const OString& rFile ) const - { - return findFontFileID(nDirID, rFile, 0) != 0; - } - static FontFamily matchFamilyName( const OUString& rFamily ); PrintFont* getFont( fontID nID ) const diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 4db801ec2837..49223ef03784 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -109,7 +109,6 @@ public: GlyphMetric() : mnAdvanceWidth(0) {} Point GetOffset() const { return maOffset; } - Point GetDelta() const { return maDelta; } Size GetSize() const { return maSize; } long GetCharWidth() const { return mnAdvanceWidth; } diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index 5282a3751771..39dbc7b5760f 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -104,7 +104,7 @@ public: * rAppName: text to appear in the %%Creator comment * rSetupData: JobData that apply to this job * pGraphics: the graphics used to print this job; - * this graphics must live until End/AbortJob has returned + * this graphics must live until EndJob() has returned * bIsQuickJob: the job was started as "direct print" meaning * the quick command for spooling should be used instead * of the normal command @@ -119,8 +119,6 @@ public: ); bool EndJob (); - bool AbortJob (); - bool StartPage (const JobData& rJobSetup); bool EndPage (); }; diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index 7b9c083e0034..420c8e553f61 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -48,11 +48,7 @@ namespace grutils GrFeatureParser(const gr_face * face, const OString& features, const OString& lang); GrFeatureParser(const gr_face * face, const OString& lang); ~GrFeatureParser(); - //size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const; - bool parseErrors() { return mbErrors; }; - //static bool isValid(gr::Font & font, gr::FeatureSetting & setting); gr_uint32 getLanguage() const { return maLang.num; }; - bool hasLanguage() const { return (maLang.label[0] != '\0'); } sal_Int32 hashCode() const { return mnHash; } size_t numFeatures() const { return mnNumSettings; } gr_feature_val * values() const { return mpSettings; }; diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index db9807f06659..3a8312ded6a9 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -321,7 +321,6 @@ public: bool IsMultiSelectionEnabled() const { return mbMulti; } void SetMultiSelectionSimpleMode( bool bSimple ) { mbSimpleMode = bSimple; } - bool IsMultiSelectionSimpleMode() const { return mbSimpleMode; } void EnableMouseMoveSelect( bool bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } bool IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } diff --git a/vcl/inc/image.h b/vcl/inc/image.h index bc1426299436..479bb66cd87e 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -108,8 +108,6 @@ struct ImplImageRefData ImplImageRefData() {} // Um Warning zu umgehen ~ImplImageRefData(); - - bool IsEqual( const ImplImageRefData& rData ); }; // - ImpImageData - diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 3a02b1d9483a..05f05e3842ec 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -117,11 +117,8 @@ public: long GetLineHeight() const { return mnLineHeight; } long GetSlant() const { return mnSlant; } - bool IsDeviceFont() const { return ((mnMiscFlags & DEVICE_FLAG) != 0); } bool IsScalable() const { return ((mnMiscFlags & SCALABLE_FLAG) != 0); } - bool SupportsLatin() const { return ((mnMiscFlags & LATIN_FLAG) != 0); } bool SupportsCJK() const { return ((mnMiscFlags & CJK_FLAG) != 0); } - bool SupportsCTL() const { return ((mnMiscFlags & CTL_FLAG) != 0); } bool operator==( const ImplFontMetric& ) const; }; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 5175e2d7eff5..9a33c12430b2 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -124,7 +124,6 @@ protected: std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs); // helper functions often used with ImplLayoutArgs -bool IsDiacritic( sal_UCS4 ); int GetVerticalFlags( sal_UCS4 ); // all positions/widths are in font units diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index dcf7f2f1eabb..f465c950adb3 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -353,8 +353,6 @@ public: GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; } GdkWindow* getForeignTopLevel() const { return m_pForeignTopLevel; } GdkNativeWindow getForeignTopLevelWindow() const { return m_aForeignTopLevelWindow; } - GdkVisibilityState getVisibilityState() const - { return m_nVisibility; } Pixmap getBackgroundPixmap() const { return m_hBackgroundPixmap; } SalX11Screen getXScreenNumber() const { return m_nXScreen; } int GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; } diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index e74de22f3de3..7322ef492ab7 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -75,7 +75,6 @@ public: void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } Menu* GetMenu() { return mpVCLMenu; } - GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } GMenuModel* GetMenuModel() { return mpMenuModel; } unsigned GetItemCount() { return maItems.size(); } diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 7d4000033964..b0fcba922451 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -284,11 +284,6 @@ public: bool supportsSplash() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_SPLASH ] != 0; } /* - * tells whteher there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR - */ - bool supportsToolbar() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_TOOLBAR ] != 0; } - - /* * enables always on top or equivalent if possible */ virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const; diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index f7d4fcea0ab2..4ae76d289256 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -72,7 +72,6 @@ public: sal_uInt8& GetKind() { return nKind; } void SetRightToLeft(bool b) { bRightToLeft = b; } bool IsRightToLeft() const { return bRightToLeft; } - bool HasValidSize() const { return nWidth != (-1); } }; class TETextPortionList : public std::vector<TETextPortion*> diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 14fdbaa8dfa1..f0bfbabdc783 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -435,11 +435,6 @@ bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter; } -bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) -{ - return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; -} - OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index c288132a4ce2..f568c515b4f5 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -99,7 +99,6 @@ public: OUString GetImportFilterTypeName( sal_uInt16 nFormat ); bool IsImportInternalFilter( sal_uInt16 nFormat ); - bool IsImportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 84cdfcac5ac8..12a929454c37 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1205,11 +1205,6 @@ OUString GraphicFilter::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry return pConfig->GetImportWildcard( nFormat, nEntry ); } -bool GraphicFilter::IsImportPixelFormat( sal_uInt16 nFormat ) -{ - return pConfig->IsImportPixelFormat( nFormat ); -} - sal_uInt16 GraphicFilter::GetExportFormatCount() { return pConfig->GetExportFormatCount(); diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 189f66a920b6..45f69feec00a 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -134,12 +134,6 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div) // SgfFilterSDrw -SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd) -{ - rIStream.Read(&rDtHd.Reserved[0], DtHdSize); - return rIStream; -} - void DtHdOverSeek(SvStream& rInp) { sal_uLong FPos=rInp.Tell(); diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 77c4981bef38..6223d45923fa 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -42,7 +42,6 @@ struct PointType { class DtHdType { public: sal_uInt8 Reserved[256]; - friend SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd); friend void DtHdOverSeek(SvStream& rInp); }; @@ -157,7 +156,6 @@ public: } virtual ~ObjkType() {} friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); - friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); virtual void Draw(OutputDevice& rOut); }; diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 401074373cda..f4bb3c849244 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1706,12 +1706,4 @@ bool WriteDIBBitmapEx( return false; } -bool WriteDIBV5( - const Bitmap& rSource, - const Bitmap& rSourceAlpha, - SvStream& rOStm) -{ - return ImplWriteDIB(rSource, &rSourceAlpha, rOStm, false, true); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 4cd5334971be..bbdb4ebd2d07 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2954,45 +2954,4 @@ void GDIMetaFile::UseCanvas( bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, - const OUString& rGraphicServiceName, - const void* _pData, - sal_uInt32 nDataSize ) -{ - const sal_uInt8* pData=static_cast<sal_uInt8 const *>(_pData); - - // FIXME: Data gets copied twice, unfortunately - OString aRendererServiceName( - rRendererServiceName.getStr(), - rRendererServiceName.getLength(), - RTL_TEXTENCODING_ASCII_US); - OString aGraphicServiceName( - rGraphicServiceName.getStr(), - rGraphicServiceName.getLength(), - RTL_TEXTENCODING_ASCII_US); - - std::vector<sal_uInt8> aMem( - aRendererServiceName.getLength()+ - aGraphicServiceName.getLength()+2+nDataSize); - sal_uInt8* pMem=&aMem[0]; - - std::copy(aRendererServiceName.getStr(), - aRendererServiceName.getStr()+aRendererServiceName.getLength()+1, - pMem); - pMem+=aRendererServiceName.getLength()+1; - std::copy(aGraphicServiceName.getStr(), - aGraphicServiceName.getStr()+aGraphicServiceName.getLength()+1, - pMem); - pMem+=aGraphicServiceName.getLength()+1; - - std::copy(pData,pData+nDataSize, - pMem); - - return new MetaCommentAction( - "DELEGATE_PLUGGABLE_RENDERER", - 0, - &aMem[0], - aMem.size()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 88c4a6297d95..02c190c21426 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -387,36 +387,6 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const mnJobs == rInfo.mnJobs; } -SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) -{ - VersionCompat aCompat( rOStream, StreamMode::WRITE, 1 ); - - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); - rOStream.WriteUInt32( static_cast<sal_uInt32>(rInfo.mnStatus) ); - rOStream.WriteUInt32( rInfo.mnJobs ); - - return rOStream; -} - -SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) -{ - VersionCompat aCompat( rIStream, StreamMode::READ ); - - rInfo.maPrinterName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - sal_uInt32 nTmp; - rIStream.ReadUInt32( nTmp ); - rInfo.mnStatus = static_cast<PrintQueueFlags>(nTmp); - rIStream.ReadUInt32( rInfo.mnJobs ); - - return rIStream; -} - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = PrintQueueFlags::NONE; diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 04cbdd2e7c30..0154aaafedee 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -153,38 +153,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) return s; } -// TODO: ask the glyph directly, for now we need this method because of #i99367# -// true if a codepoint doesn't influence the logical text width -bool IsDiacritic( sal_UCS4 nChar ) -{ - // shortcut obvious non-diacritics - if( nChar < 0x0300 ) - return false; - if( nChar >= 0x2100 ) - return false; - - // TODO: #i105058# use icu uchar.h's character classification instead of the handcrafted table - struct DiaRange { sal_UCS4 mnMin, mnEnd;}; - static const DiaRange aRanges[] = { - {0x0300, 0x0370}, - {0x0590, 0x05BE}, {0x05BF, 0x05C0}, {0x05C1, 0x05C3}, {0x05C4, 0x05C6}, {0x05C7, 0x05C8}, - {0x0610, 0x061B}, {0x064B, 0x0660}, {0x0670, 0x0671}, {0x06D6, 0x06DD}, {0x06DF, 0x06E5}, {0x06E7, 0x06E9}, {0x06EA,0x06EF}, - {0x0730, 0x074D}, {0x07A6, 0x07B1}, {0x07EB, 0x07F4}, - {0x1DC0, 0x1E00}, - {0x205F, 0x2070}, {0x20D0, 0x2100}, - {0xFB1E, 0xFB1F} - }; - - // TODO: almost anything is faster than an O(n) search - static const int nCount = SAL_N_ELEMENTS(aRanges); - const DiaRange* pRange = &aRanges[0]; - for( int i = nCount; --i >= 0; ++pRange ) - if( (pRange->mnMin <= nChar) && (nChar < pRange->mnEnd) ) - return true; - - return false; -} - int GetVerticalFlags( sal_UCS4 nChar ) { if( (nChar >= 0x1100 && nChar <= 0x11f9) // Hangul Jamo diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 2f2eb2bcfe7e..1e38ca817ea4 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <cppuhelper/factory.hxx> -#include <xmloff/xmlreg.hxx> #include <facreg.hxx> |