diff options
-rw-r--r-- | connectivity/inc/connectivity/dbcharset.hxx | 1 | ||||
-rw-r--r-- | connectivity/source/commontools/dbcharset.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/vba/excelvbahelper.cxx | 22 | ||||
-rw-r--r-- | sc/source/ui/vba/excelvbahelper.hxx | 1 | ||||
-rwxr-xr-x | unusedcode.easy | 10 | ||||
-rw-r--r-- | vbahelper/inc/vbahelper/vbahelper.hxx | 11 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 31 |
7 files changed, 0 insertions, 82 deletions
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index 60c96fb71a2f..cb13fcd303f4 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -116,7 +116,6 @@ namespace dbtools ::rtl::OUString getIanaName() const { return m_aIanaName; } protected: - CharsetIteratorDerefHelper(); CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName ); }; diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index 87b78c408ff9..45729df8fa7c 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -154,12 +154,6 @@ namespace dbtools { } - //------------------------------------------------------------------------- - CharsetIteratorDerefHelper::CharsetIteratorDerefHelper() - :m_eEncoding(RTL_TEXTENCODING_DONTKNOW) - { - } - //========================================================================= //= OCharsetMap::CharsetIterator //========================================================================= diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 7ee13b2ca1c0..3d80796718f1 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -139,19 +139,6 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->GetViewData()->SetZoom( aFract, aFract, nTabs ); pViewSh->RefreshZoom(); } -bool isInPrintPreview( SfxViewFrame* pView ) -{ - sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0; - if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() > -nViewNo && !pView->GetObjectShell()->IsInPlaceActive() ) - { - SfxViewFactory &rViewFactory = - pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo); - if ( pView->GetCurViewId() == rViewFactory.GetOrdinal() ) - return true; - } - return false; -} const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning")); @@ -321,15 +308,6 @@ getCurrentBestViewShell( const uno::Reference< uno::XComponentContext >& xConte return getBestViewShell( xModel ); } -SfxViewFrame* -getViewFrame( const uno::Reference< frame::XModel >& xModel ) -{ - ScTabViewShell* pViewShell = getBestViewShell( xModel ); - if ( pViewShell ) - return pViewShell->GetViewFrame(); - return NULL; -} - sal_Bool IsR1C1ReferFormat( ScDocument* pDoc, const rtl::OUString& sRangeStr ) { ScRangeList aCellRanges; diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 85031ad37248..53f44c997f13 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -59,7 +59,6 @@ bool implnCopyRange( const css::uno::Reference< css::frame::XModel>& xModel, con ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ; ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ; ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext ); -SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel ); sal_Bool IsR1C1ReferFormat( ScDocument* pDoc, const ::rtl::OUString& sRangeStr ); formula::FormulaGrammar::Grammar GetFormulaGrammar( ScDocument* pDoc, const ScAddress& sAddress, const css::uno::Any& aFormula ); diff --git a/unusedcode.easy b/unusedcode.easy index 80eff11135ad..58a4e927b5cf 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -875,7 +875,6 @@ cppcanvas::internal::(anonymous namespace)::TransparencyGroupAction::Transparenc cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite> const&, boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter> const&) cppcanvas::internal::ImplText::ImplText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int) -dbtools::CharsetIteratorDerefHelper::CharsetIteratorDerefHelper() dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&) dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&) dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&) @@ -908,15 +907,6 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas: nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) o3tltests::cow_wrapper_client2::queryUnmodified() const o3tltests::cow_wrapper_client3::queryUnmodified() const -ooo::vba::Millimeter::get() -ooo::vba::Millimeter::getInPoints() -ooo::vba::Millimeter::set(double) -ooo::vba::Millimeter::setInHundredthsOfOneMillimeter(double) -ooo::vba::createVBAUnoAPIService(SfxObjectShell*, char const*) -ooo::vba::excel::getViewFrame(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&) -ooo::vba::excel::isInPrintPreview(SfxViewFrame*) -ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool) -ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int) oox::AttributeConversion::decodeHyperHex(rtl::OUString const&) oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&) oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&) diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 00dfe585c9d7..9a3da3c5f836 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -75,7 +75,6 @@ namespace ooo VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getVBADocument( const css::uno::Reference< css::frame::XModel >& xModel ); VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell ); VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException); - VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException); css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); @@ -103,16 +102,10 @@ namespace ooo /** Extracts a 32-bit integer value from the passed Any, which may contain an integer or floating-point value. Throws, if the Any is empty or contains an incompatible type. */ VBAHELPER_DLLPUBLIC sal_Int32 extractIntFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException); - /** Extracts a 32-bit integer value from the passed Any, which may contain an integer or floating-point value. - Returns nDefault, if rAny is empty. Throws, if the Any contains an incompatible type. */ - VBAHELPER_DLLPUBLIC sal_Int32 extractIntFromAny( const css::uno::Any& rAny, sal_Int32 nDefault ) throw (css::uno::RuntimeException); /** Extracts a boolean value from the passed Any, which may contain a Boolean or an integer or floating-point value. Throws, if the Any is empty or contains an incompatible type. */ VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException); - /** Extracts a boolean value from the passed Any, which may contain a Boolean or an integer or floating-point value. - Returns bDefault, if rAny is empty. Throws, if the Any contains an incompatible type. */ - VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny, bool bDefault ) throw (css::uno::RuntimeException); /** Extracts a string from the passed Any, which may contain a Boolean, a value, or a string. Throws, if the Any is empty or contains an incompatible type. */ @@ -147,12 +140,8 @@ public: Millimeter(double mm); - void set(double mm); void setInPoints(double points) ; - void setInHundredthsOfOneMillimeter(double hmm); - double get(); double getInHundredthsOfOneMillimeter(); - double getInPoints(); static sal_Int32 getInHundredthsOfOneMillimeter(double points); static double getInPoints(int _hmm); }; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index f99077dbf00f..03525bafbfef 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -97,13 +97,6 @@ namespace vba namespace { const double factor = 2540.0 / 72.0; } -css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException) -{ - OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); - ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); - return getVBAServiceFactory( pShell )->createInstance( sVarName ); -} - // helper method to determine if the view ( calc ) is in print-preview mode bool isInPrintPreview( SfxViewFrame* pView ) { @@ -501,11 +494,6 @@ sal_Int32 extractIntFromAny( const uno::Any& rAny ) throw (uno::RuntimeException throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid type, cannot convert to integer." ) ), 0 ); } -sal_Int32 extractIntFromAny( const uno::Any& rAny, sal_Int32 nDefault ) throw (uno::RuntimeException) -{ - return rAny.hasValue() ? extractIntFromAny( rAny ) : nDefault; -} - bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException) { switch( rAny.getValueType().getTypeClass() ) @@ -527,11 +515,6 @@ bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException) throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid type, cannot convert to boolean." ) ), 0 ); } -bool extractBoolFromAny( const uno::Any& rAny, bool bDefault ) throw (uno::RuntimeException) -{ - return rAny.hasValue() ? extractBoolFromAny( rAny ) : bDefault; -} - ::rtl::OUString extractStringFromAny( const uno::Any& rAny, bool bUppercaseBool ) throw (uno::RuntimeException) { switch( rAny.getValueType().getTypeClass() ) @@ -1179,29 +1162,15 @@ Millimeter::Millimeter():m_nMillimeter(0) {} Millimeter::Millimeter(double mm):m_nMillimeter(mm) {} -void Millimeter::set(double mm) { m_nMillimeter = mm; } void Millimeter::setInPoints(double points) { m_nMillimeter = points * factor / 100.0; } -void Millimeter::setInHundredthsOfOneMillimeter(double hmm) -{ - m_nMillimeter = hmm / 100; -} - -double Millimeter::get() -{ - return m_nMillimeter; -} double Millimeter::getInHundredthsOfOneMillimeter() { return m_nMillimeter * 100; } -double Millimeter::getInPoints() -{ - return m_nMillimeter / factor * 100.0; -} sal_Int32 Millimeter::getInHundredthsOfOneMillimeter(double points) { |