svx/source/dialog/svxbmpnumvalueset.cxx | 8 --- svx/source/engine3d/obj3d.cxx | 2 svx/source/engine3d/polysc3d.cxx | 2 svx/source/engine3d/scene3d.cxx | 2 svx/source/fmcomp/gridctrl.cxx | 54 ------------------------ svx/source/gallery2/galmisc.cxx | 2 svx/source/gengal/gengal.cxx | 32 -------------- svx/source/inc/docrecovery.hxx | 4 - svx/source/inc/fmexch.hxx | 8 --- svx/source/inc/fmurl.hxx | 1 svx/source/items/grfitem.cxx | 18 -------- svx/source/items/viewlayoutitem.cxx | 11 ---- svx/source/items/zoomslideritem.cxx | 11 ---- svx/source/sdr/contact/displayinfo.cxx | 2 svx/source/sdr/contact/viewcontactofsdrpage.cxx | 4 - svx/source/sdr/properties/properties.cxx | 14 ------ svx/source/tbxctrls/linectrl.cxx | 17 ------- svx/source/tbxctrls/tbxcolorupdate.cxx | 2 18 files changed, 194 deletions(-)
New commits: commit 3b328186706e6819acfea7b3a6dc8c9d3b6f9693 Author: Takeshi Abe <[email protected]> Date: Sat Apr 28 01:13:49 2012 +0900 removed unused defines Change-Id: I892902a8a4c6c01092d53019bc8a1b3f88667a4f diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index e885e17..6758b92 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -81,14 +81,6 @@ using rtl::OUString; #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 -#define PAGETYPE_USER_START 10 - -#define SHOW_NUMBERING 0 -#define SHOW_BULLET 1 -#define SHOW_BITMAP 2 - -#define MAX_BMP_WIDTH 16 -#define MAX_BMP_HEIGHT 16 static const sal_Char cNumberingType[] = "NumberingType"; static const sal_Char cValue[] = "Value"; diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index d8105dc..0081bee 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -85,8 +85,6 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/e3dsceneupdater.hxx> -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - ////////////////////////////////////////////////////////////////////////////// using namespace com::sun::star; diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 709f667..38c9dad 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -43,8 +43,6 @@ #include <svx/xtable.hxx> #include <svx/xlnwtit.hxx> -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TYPEINIT1(E3dPolyScene, E3dScene); diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 805829f..76d6a89 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -55,8 +55,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/e3dsceneupdater.hxx> -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - ////////////////////////////////////////////////////////////////////////////// class ImpRemap3DDepth diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 36a7571..ce923fb 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -191,9 +191,6 @@ static rtl::OUString Smartify( const rtl::OUString &rPath ) return aURL.GetMainURL( INetURLObject::NO_DECODE ); } -#define OUSTRING_CSTR( str ) \ - rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() - void GalApp::Init() { if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index dfbd66c..1159f01 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -50,17 +50,13 @@ #define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:")) -#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doPrepareEmergencySave" )) #define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave" )) #define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery" )) #define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport" )) -#define RECOVERY_CMDPART_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryBackup" )) -#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryCleanUp" )) #define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")) #define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave" )) #define RECOVERY_CMD_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery" )) -#define RECOVERY_CMD_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doCrashReport" )) #define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup" )) #define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp" )) diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 43d8a43..42781ab 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -41,14 +41,6 @@ class FmFormPage; class SvLBoxEntry; //======================================================================== -// Exchange types -#define SVX_FM_FIELD_EXCH String("SvxFormFieldExch", sizeof("SvxFormFieldExch")) -#define SVX_FM_CONTROL_EXCH String("SvxFormExplCtrlExch", sizeof("SvxFormExplCtrlExch")) -#define SVX_FM_CONTROLS_AS_PATH String("SvxFormControlsAsPathExchange", sizeof("SvxFormControlsAsPathExchange")) -#define SVX_FM_HIDDEN_CONTROLS String("SvxFormHiddenControlsExchange", sizeof("SvxFormHiddenControlsExchange")) -#define SVX_FM_FILTER_FIELDS String("SvxFilterFieldExchange", sizeof("SvxFilterFieldExchange")) - -//======================================================================== class SvTreeListBox; //........................................................................ diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index d1b39c6..f6d1553 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -29,7 +29,6 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORMSLOTS_PREFIX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/" ) ) #define FMURL_FORM_POSITION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/positionForm" ) ) #define FMURL_FORM_RECORDCOUNT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/RecordCount" ) ) #define FMURL_RECORD_MOVEFIRST rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToFirst" ) ) diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 510ea57..1ec2c7f 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -34,8 +34,6 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> -#define ALL_GHOSTED_DRAWMODES (DRAWMODE_GHOSTEDLINE|DRAWMODE_GHOSTEDFILL|DRAWMODE_GHOSTEDTEXT|DRAWMODE_GHOSTEDBITMAP|DRAWMODE_GHOSTEDGRADIENT) - ////////////////////////////////////////////////////////////////////////////// namespace sdr diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 4526fd3..aa0745b 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -51,10 +51,6 @@ ////////////////////////////////////////////////////////////////////////////// -#define PAPER_SHADOW(SIZE) (SIZE >> 8) - -////////////////////////////////////////////////////////////////////////////// - namespace sdr { namespace contact diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index ccc047c..2d649d4 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -57,23 +57,6 @@ using namespace ::com::sun::star::lang; // STATIC DATA ----------------------------------------------------------- -#define RESIZE_VALUE_POPUP(value_set) \ -{ \ - Size aSize = GetOutputSizePixel(); \ - aSize.Width() -= 4; \ - aSize.Height() -= 4; \ - (value_set).SetPosSizePixel( Point(2,2), aSize ); \ -} - -#define CALCSIZE_VALUE_POPUP(value_set,item_size) \ -{ \ - Size aSize = (value_set).CalcWindowSizePixel( (item_size) ); \ - aSize.Width() += 4; \ - aSize.Height() += 4; \ - SetOutputSizePixel( aSize ); \ -} - - SFX_IMPL_TOOLBOX_CONTROL( SvxLineStyleToolBoxControl, XLineStyleItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxLineWidthToolBoxControl, XLineWidthItem ); SFX_IMPL_TOOLBOX_CONTROL( SvxLineColorToolBoxControl, XLineColorItem ); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index c62ce1b..9c38498 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -34,8 +34,6 @@ #include <vcl/bmpacc.hxx> #include <tools/debug.hxx> -#define IMAGE_COL_TRANSPARENT COL_LIGHTMAGENTA - //........................................................................ namespace svx { commit d50f02bec4a70bd26a518e4e76f4a876454ab937 Author: Takeshi Abe <[email protected]> Date: Sat Apr 28 01:12:32 2012 +0900 removed dead code Change-Id: If67f8e981e034890e4fde2280f537fdfff6af0ff diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index d0bcceb..10b940a 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2941,60 +2941,6 @@ void DbGridControl::DeleteSelectedRows() if (!m_pSeekCursor) return; - -/* Application::EnterWait(); - Reference< XPropertySet > xSet = (XPropertySet*)xSeekCursor->queryInterface(XPropertySet::getSmartUik()); - - // wenn mehr als 25 Datensaetze geloescht werden, wird der Cache abgeschaltet - // da das loeschen ansonsten zu langsam wird - sal_uInt16 nCacheSize = 0; - if (GetSelectRowCount() > 25) - { - // CacheSize merken und Cache zuruecksetzen - nCacheSize = xSet->getPropertyValue(L"CacheSize").getUINT16(); - if (nCacheSize) - xSet->setPropertyValue(L"CacheSize", Any(sal_uInt16(0))); - } */ - - - /* - // mu� der Cache wiederhergestellt werden? - if (nCacheSize) - { - // Cache wieder einschalten - xSet->setPropertyValue(L"CacheSize", Any(sal_uInt16(nCacheSize))); - - // Browser neu einstellen - RecalcRows(GetTopRow(), GetVisibleRows(), sal_True); - - // aktuelle Zeile aktualisieren - SeekCursor(GetCurRow()); - if (IsAppendRow(m_nSeekPos)) - xDataCursor->addRecord(); - else - { - Any aBookmark = xSeekCursor->getBookmark(); - xDataCursor->moveToBookmark(aBookmark); - } - m_xCurrentRow = new DbGridRow(xDataCursor); - m_nCurrentPos = m_nSeekPos; - - // complett invalidieren - Invalidate(); - } - else - // Browser neu einstellen - RecalcRows(GetTopRow(), GetVisibleRows(), sal_True); - - // gibt es keine Selection mehr? - if (!GetSelectRowCount()) - ActivateCell(); - - m_aBar.InvalidateAll(); - Application::LeaveWait(); - - m_bUpdating = sal_False; -*/ } //------------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index b7262c1..a618e1d 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -439,8 +439,6 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : GalleryProgress::~GalleryProgress() { -// if( mpFilter ) -// mpFilter->SetUpdatePercentHdl( Link() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 0104b70..36a7571 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -150,7 +150,6 @@ static void createTheme( rtl::OUString aThemeName, Graphic aGraphic; String aFormat; -#if 1 if ( ! pGalTheme->InsertURL( *aIter ) ) fprintf( stderr, "Failed to import '%s'\n", rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); @@ -159,34 +158,6 @@ static void createTheme( rtl::OUString aThemeName, rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), sal::static_int_cast< unsigned long >( pGalTheme->GetObjectCount() ) ); - -#else // only loads BMPs - SvStream *pStream = ::utl::UcbStreamHelper::CreateStream( *aIter, STREAM_READ ); - if (!pStream) { - fprintf( stderr, "Can't find image to import\n" ); - disposeGallery( pGallery ); - exit (1); - } - *pStream >> aGraphic; - delete pStream; - if( aGraphic.GetType() == GRAPHIC_NONE ) - { - fprintf( stderr, "Failed to load '%s'\n", - rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ).getStr() ); - continue; - } - - SgaObjectBmp aObject( aGraphic, *aIter, aFormat ); - if ( ! aObject.IsValid() ) { - fprintf( stderr, "Failed to create thumbnail for image\n" ); - continue; - } - - if ( ! pGalTheme->InsertObject( aObject ) ) { - fprintf( stderr, "Failed to insert file or URL\n" ); - continue; - } -#endif } pGallery->ReleaseTheme( pGalTheme, aListener ); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index a27a2b9..d44e653 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -67,24 +67,6 @@ int SvxGrfCrop::operator==( const SfxPoolItem& rAttr ) const nBottom == ((const SvxGrfCrop&)rAttr).GetBottom(); } -/* -SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const -{ - return new SvxGrfCrop( *this ); -} -*/ - -/* -sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const -{ - DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || - SOFFICE_FILEFORMAT_40==nFFVer || - SOFFICE_FILEFORMAT_NOW==nFFVer, - "SvxGrfCrop: exist a new fileformat?" ); - return GRFCROP_VERSION_SWDEFAULT; -} -*/ - SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { sal_Int32 top, left, right, bottom; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index ef26ecb..ce80daf 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -78,13 +78,6 @@ SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { -/* sal_uInt16 nValue; - sal_uInt16 nValSet; - sal_Int8 nType; - rStrm >> nValue >> nValSet >> nType; - SvxZoomItem* pNew = new SvxZoomItem( (SvxZoomType)nType, nValue, Which() ); - pNew->SetValueSet( nValSet ); - return pNew;*/ return 0; } @@ -92,9 +85,6 @@ SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersi SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { -/* rStrm << (sal_uInt16)GetValue() - << nValueSet - << (sal_Int8)eType;*/ return rStrm; } @@ -138,7 +128,6 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 06c7540..9637859 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -75,13 +75,6 @@ SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { -/* sal_uInt16 nValue; - sal_uInt16 nValSet; - sal_Int8 nType; - rStrm >> nValue >> nValSet >> nType; - SvxZoomItem* pNew = new SvxZoomItem( (SvxZoomType)nType, nValue, Which() ); - pNew->SetValueSet( nValSet ); - return pNew;*/ return 0; } @@ -89,9 +82,6 @@ SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersi SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { -/* rStrm << (sal_uInt16)GetValue() - << nValueSet - << (sal_Int8)eType;*/ return rStrm; } @@ -157,7 +147,6 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index ce3b999..4d4794f 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -108,20 +108,6 @@ namespace sdr // Overload where an ItemSet is implemented. } - //void BaseProperties::SetItemAndBroadcast(const SfxPoolItem& rItem) - //{ - // ItemChangeBroadcaster aC(GetSdrObject()); - // SetObjectItem(rItem); - // BroadcastItemChange(aC); - //} - - //void BaseProperties::ClearItemAndBroadcast(const sal_uInt16 nWhich) - //{ - // ItemChangeBroadcaster aC(GetSdrObject()); - // ClearObjectItem(nWhich); - // BroadcastItemChange(aC); - //} - void BaseProperties::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems) { ItemChangeBroadcaster aC(GetSdrObject());
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
