[Libreoffice-commits] .: 2 commits - connectivity/inc connectivity/source svtools/inc svtools/source svx/source unusedcode.easy

Caolán McNamara caolan at kemper.freedesktop.org
Sun Jul 15 14:51:00 PDT 2012


 connectivity/inc/connectivity/dbconversion.hxx   |    3 -
 connectivity/source/commontools/dbconversion.cxx |   23 ---------
 svtools/inc/svtools/svlbitm.hxx                  |    1 
 svtools/source/contnr/svlbitm.cxx                |   12 ----
 svx/source/dialog/compressgraphicdialog.cxx      |    7 --
 unusedcode.easy                                  |   56 +++++++----------------
 6 files changed, 21 insertions(+), 81 deletions(-)

New commits:
commit afdb80205679937a4d7503dc3715f39a4774a201
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 15 22:50:52 2012 +0100

    WaE: unused variables and misordered initialization list
    
    Change-Id: I2f49383d5c9e097edf52776818db4e89497aca5c

diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 637af17..bc6afa6 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -56,10 +56,10 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, const Graphic&
     m_aFixedTextDPI         ( this,    SVX_RES( FT_DPI ) ),
     m_aLosslessRB           ( this,    SVX_RES( RB_LOSSLESS_COMPRESSION ) ),
     m_aJpegCompRB           ( this,    SVX_RES( RB_JPEG_COMPRESSION ) ),
-    m_aCompressionMF        ( this,    SVX_RES( MF_COMPRESSION_FACTOR ) ),
     m_aCompressionFT        ( this,    SVX_RES( FT_COMPRESSION ) ),
-    m_aQualityMF            ( this,    SVX_RES( MF_QUALITY_FACTOR ) ),
+    m_aCompressionMF        ( this,    SVX_RES( MF_COMPRESSION_FACTOR ) ),
     m_aQualityFT            ( this,    SVX_RES( FT_QUALITY ) ),
+    m_aQualityMF            ( this,    SVX_RES( MF_QUALITY_FACTOR ) ),
     m_aCropCB               ( this,    SVX_RES( CB_CROP ) ),
     m_aBtnOK                ( this,    SVX_RES( BUTTON_CG_OK ) ),
     m_aBtnCancel            ( this,    SVX_RES( BUTTON_CG_CANCEL ) ),
@@ -140,9 +140,6 @@ void CompressGraphicsDialog::Update()
     aViewSizeString += ( " DPI" ) ;
     m_aFixedText3.SetText(aViewSizeString);
 
-    int nPixelX = (sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Width(),   2, MAP_100TH_MM, FUNIT_INCH) / 100 * m_dResolution );
-    int nPixelY = (sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Height(),  2, MAP_100TH_MM, FUNIT_INCH) / 100 * m_dResolution );
-
     SvMemoryStream aMemStream;
     aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
     m_aGraphic.ExportNative(aMemStream);
commit bfcaa777c4a803c21208c8aeb8f2674943b243fb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 15 22:27:46 2012 +0100

    callcatcher: update unused code list
    
    Change-Id: I045ac2928d4b8cf99f9f76c20a9e489adc34ed66

diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index 0f16414..78df8d0 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -115,9 +115,6 @@ namespace dbtools
         static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate);
 
 
-        /** return the given DateTime as JDBC compliant 64 bit value
-        */
-        static sal_Int64 toINT64(const ::com::sun::star::util::DateTime& rVal);
         static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& rVal);
 
         static sal_Int32 toDays(const ::com::sun::star::util::Date& _rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index bed868c..087495d 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -137,29 +137,6 @@ namespace dbtools
     }
 
     //------------------------------------------------------------------------------
-    sal_Int64 DBTypeConversion::toINT64(const DateTime& rVal)
-    {
-        // normalize time
-        sal_Int32 nSeconds          = rVal.Seconds + rVal.HundredthSeconds / 100;
-        sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
-        sal_Int32 nMinutes          = rVal.Minutes + nSeconds / 60;
-        nSeconds                    = nSeconds % 60;
-        sal_Int32 nHours            = rVal.Hours + nMinutes / 60;
-        nMinutes                    = nMinutes % 60;
-
-        // assemble time
-        sal_Int32 nTime = (sal_Int32)(nHundredthSeconds + (nSeconds*100) + (nMinutes*10000) + (nHours*1000000));
-        sal_Int32 nDate = ((sal_Int32)(rVal.Day%100)) + (((sal_Int32)(rVal.Month%100))*100) + (((sal_Int32) rVal.Year%10000)*10000);
-        sal_Int64 nRet;
-
-        nRet = (sal_Int64) nTime;
-        nRet <<= 32;
-        nRet += nDate;
-
-        return nRet;
-    }
-
-    //------------------------------------------------------------------------------
     sal_Int32 DBTypeConversion::getMsFromTime(const Time& rVal)
     {
         sal_Int32   nHour     = rVal.Hours;
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index ae259ac..a56ea7d 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -186,7 +186,6 @@ public:
     virtual         ~SvLBoxButton();
     virtual void    InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
     virtual sal_uInt16  IsA();
-    void            Check( SvLBox* pView, SvLBoxEntry*, sal_Bool bCheck );
     virtual sal_Bool    ClickHdl(SvLBox* pView, SvLBoxEntry* );
     virtual void    Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
     virtual SvLBoxItem* Create() const;
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 509654a..7826d9c 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -345,18 +345,6 @@ sal_uInt16 SvLBoxButton::IsA()
     return SV_ITEM_ID_LBOXBUTTON;
 }
 
-void SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, sal_Bool bOn)
-{
-    DBG_CHKTHIS(SvLBoxButton,0);
-    if ( bOn != IsStateChecked() )
-    {
-        if ( bOn )
-            SetStateChecked();
-        else
-            SetStateUnchecked();
-    }
-}
-
 sal_Bool SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry )
 {
     DBG_CHKTHIS(SvLBoxButton,0);
diff --git a/unusedcode.easy b/unusedcode.easy
index 86768be..7e7b5ad 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,8 @@
+(anonymous namespace)::compareFiles(rtl::OUString const&, rtl::OUString const&)
+(anonymous namespace)::dumpFillBitmapNameAsAttribute(rtl::OUString, _xmlTextWriter*)
+(anonymous namespace)::dumpFillHatchNameAsAttribute(rtl::OUString, _xmlTextWriter*)
+(anonymous namespace)::dumpGeometryAsElement(com::sun::star::drawing::PolyPolygonBezierCoords, _xmlTextWriter*)
+(anonymous namespace)::dumpPolyPolygonBezierAsElement(com::sun::star::drawing::PolyPolygonBezierCoords, _xmlTextWriter*)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
 HTMLControls::Insert(HTMLControl const*&, unsigned short&)
 HTMLControls::Insert(HTMLControl const**, unsigned short)
@@ -9,22 +14,9 @@ InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
 InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
 InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
 InsCapOptArr::Remove(unsigned short, unsigned short)
-MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
-MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
-MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
-MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
-MSDffImportRecords::Remove(unsigned short, unsigned short)
 PopupMenu::SetSelectedEntry(unsigned short)
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
-ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short)
-ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short)
-ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short)
-ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, unsigned short)
-ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
-ScAddInDocs::Insert(ScDocument* const*, unsigned short)
-ScAddInDocs::Remove(ScDocument* const&, unsigned short)
 ScCompressedArray<int, unsigned char>::GetEntryCount() const
 ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
 ScCompressedArray<int, unsigned short>::GetEntryCount() const
@@ -34,6 +26,8 @@ ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
 ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
 ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
 ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
+ScDocument::GetFormattedAndUsedArea(short, short&, int&) const
+ScDocument::InitializeAllNoteCaptions(bool)
 ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
 ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
 ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
@@ -48,16 +42,15 @@ ScRTFColTwips::Remove(unsigned long const&, unsigned short)
 ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
 ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
 ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
-ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short)
-ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short)
-ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
-ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
+ScTabView::HideCursor()
 ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
 ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
+ScXMLExport::HasDrawPages(com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheetDocument>&)
+ScXMLImport::GetVisibleSheet()
 SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+SfxMedium::SfxMedium(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, String const&, String const&, SfxItemSet const*, unsigned char)
 SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
 SpinButton::SpinButton(Window*, ResId const&)
 SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
@@ -68,7 +61,6 @@ String::CreateFromAscii(char const*)
 String::CreateFromAscii(char const*, unsigned short)
 String::String(unsigned short const*)
 String::String(unsigned short const*, unsigned short)
-SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
 SvPtrarr::Replace(void* const&, unsigned short)
 SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
 SvPtrarr::_ForEach(unsigned short, unsigned short, unsigned char (*)(void* const&, void*), void*)
@@ -79,21 +71,10 @@ SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) c
 SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*)
 SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
 SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
-SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&)
-SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
-SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
-SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short)
-SvxAutocorrWordList::Remove(unsigned short, unsigned short)
 SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&)
 SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
 SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short)
 SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
-SvxMSDffShapeTxBxSort::DeleteAndDestroy(unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder const*&, unsigned short&)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder const**, unsigned short)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder const*&, unsigned short)
-SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
 SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
 SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
 SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
@@ -109,11 +90,6 @@ SwBlockNames::Insert(SwBlockName const**, unsigned short)
 SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short)
 SwBlockNames::Remove(SwBlockName const*&, unsigned short)
 SwBlockNames::Remove(unsigned short, unsigned short)
-SwContentArr::Insert(SwContent* const&, unsigned short&)
-SwContentArr::Insert(SwContent* const*, unsigned short)
-SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short)
-SwContentArr::Remove(SwContent* const&, unsigned short)
-SwContentArr::Remove(unsigned short, unsigned short)
 SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
 SwCurrShells::Insert(CurrShell* const&, unsigned short&)
 SwCurrShells::Insert(CurrShell* const*, unsigned short)
@@ -196,6 +172,14 @@ SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
 SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
 TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
+ThumbnailView::GetItemCount() const
+ThumbnailView::ImplGetFirstItem()
+ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString const&, unsigned long)
+ThumbnailView::LinkStubImplTimerHdl(void*, void*)
+ThumbnailView::SetColCount(unsigned short)
+ThumbnailView::SetLineCount(unsigned short)
+ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
+ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
 TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
 VCLXPrinterServer::getImplementationId()
 VCLXPrinterServer::getTypes()
@@ -315,7 +299,6 @@ cairocanvas::SpriteDeviceHelper::getSurface()
 cairocanvas::TextLayout::draw(_cairo*)
 canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
 cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
-cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
 comphelper::OSelectionChangeListener::disposeAdapter()
 comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
 comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
@@ -327,7 +310,6 @@ connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
 connectivity::toString(com::sun::star::uno::Any const&)
 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&)
-dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
 dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
 drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
 drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const


More information about the Libreoffice-commits mailing list