svx/inc/svdpomv.hxx | 60 ----------------
svx/source/customshapes/EnhancedCustomShape2d.cxx | 14 ---
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 15 ----
svx/source/customshapes/EnhancedCustomShapeEngine.hxx | 4 -
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 36 ---------
svx/source/dialog/_bmpmask.cxx | 1
svx/source/dialog/ctredlin.cxx | 2
svx/source/dialog/paraprev.cxx | 4 -
svx/source/dialog/pfiledlg.cxx | 13 ---
svx/source/form/datanavi.cxx | 12 ---
svx/source/unodraw/unoshtxt.cxx | 7 -
svx/source/xml/xmlgrhlp.cxx | 1
svx/source/xoutdev/xattr.cxx | 16 ----
13 files changed, 185 deletions(-)
New commits:
commit 46dde257601440024cbec83379c80df47114e079
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Fri Apr 27 00:52:43 2012 +0900
removed unused defines
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index cd383a2..e62b754 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -46,13 +46,9 @@
//
-----------------------------------------------------------------------------
-#define NMSP_IO com::sun::star::io
#define NMSP_UNO com::sun::star::uno
#define NMSP_BEANS com::sun::star::beans
#define NMSP_LANG com::sun::star::lang
-#define NMSP_UTIL com::sun::star::util
-#define NMSP_SAX com::sun::star::xml::sax
-#define NMSP_LOGGING NMSP_UTIL::logging
#define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj >
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index eb7fb64..ec9739f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -45,7 +45,6 @@
//-------------------------------------------------------------------------
#define BMP_RESID(nId) ResId(nId, DIALOG_MGR())
-#define TRANSP_STRING "Transparent"
#define TRANSP_COL (Color( 252, 252, 252 ))
#define OWN_CALLMODE SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index ba85871..58fedf0 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -59,9 +59,7 @@ static long nStaticTabs[]=
};
#define MIN_DISTANCE 6
-#define WRITER_AUTHOR 1
#define WRITER_DATE 2
-#define CALC_AUTHOR 2
#define CALC_DATE 3
RedlinData::RedlinData()
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 7e96f94..adaabab 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -31,10 +31,6 @@
#include <svx/paraprev.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-#define FOUR_POINTS 80
-
// class SvxParaPrevWindow -----------------------------------------------
SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 5ce7b8f..4ebb513 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -195,19 +195,6 @@ SvxPluginFileDlg::~SvxPluginFileDlg()
{
}
-/*************************************************************************
-|*
-|* Plugins available for the the MIME-Typ in nKind
-|* (with nKind = SID_INSERT_SOUND for MIME-Type audio
-|* SID_INSERT_VIDEO for MIME-Type video
-|*
-\************************************************************************/
-
-#define PFDLG_CHECKED_SOUND 0x0001
-#define PFDLG_CHECKED_VIDEO 0x0002
-#define PFDLG_FOUND_SOUND 0x0004
-#define PFDLG_FOUND_VIDEO 0x0008
-
void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context
_eNewContext )
{
maFileDlg.SetContext( _eNewContext );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index aab704a..bf0710c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -94,22 +94,18 @@ namespace svxform
#define PN_INSTANCE_MODEL ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Instance" ) )
#define PN_INSTANCE_ID ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ID" ) )
#define PN_INSTANCE_URL ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "URL" ) )
- #define PN_INSTANCE_URLONCE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "URLOnce" ) )
// properties of binding
#define PN_BINDING_ID ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "BindingID" ) )
#define PN_BINDING_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "BindingExpression" ) )
#define PN_BINDING_MODEL ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Model" ) )
#define PN_BINDING_NAMESPACES ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ModelNamespaces" ) )
- #define PN_BINDING_MODELID ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ModelID" ) )
#define PN_READONLY_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ReadonlyExpression" ) )
#define PN_RELEVANT_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "RelevantExpression" ) )
#define PN_REQUIRED_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "RequiredExpression" ) )
#define PN_CONSTRAINT_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ConstraintExpression" ) )
#define PN_CALCULATE_EXPR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "CalculateExpression" ) )
#define PN_BINDING_TYPE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Type" ) )
- #define PN_BINDING_READONLY ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) )
- #define PN_BINDING_ENABLED ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) )
// properties of submission
#define PN_SUBMISSION_ID ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ID" ) )
@@ -117,20 +113,12 @@ namespace svxform
#define PN_SUBMISSION_REF ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Ref" ) )
#define PN_SUBMISSION_ACTION ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Action" ) )
#define PN_SUBMISSION_METHOD ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Method" ) )
- #define PN_SUBMISSION_MODEL ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Model" ) )
#define PN_SUBMISSION_REPLACE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Replace" ) )
- // submission methods
- #define SUBMITMETHOD_POST ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "post" ) )
- #define SUBMITMETHOD_GET ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "get" ) )
- #define SUBMITMETHOD_PUT ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "put" ) )
-
// other const strings
#define TRUE_VALUE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "true()" ) )
- #define FALSE_VALUE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "false()" ) )
#define NEW_ELEMENT ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "newElement" ) )
#define NEW_ATTRIBUTE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "newAttribute" ) )
- #define EVENTTYPE_SUBTREE ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DOMSubtreeModified" ) )
#define EVENTTYPE_CHARDATA ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DOMCharacterDataModified" ) )
#define EVENTTYPE_ATTR ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DOMAttrModified" ) )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index f87e976..dac1972 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -65,7 +65,6 @@ using namespace com::sun::star::io;
using ::com::sun::star::lang::XMultiServiceFactory;
#define XML_GRAPHICSTORAGE_NAME "Pictures"
-#define XML_PACKAGE_URL_BASE "vnd.sun.star.Package:"
#define XML_GRAPHICOBJECT_URL_BASE "vnd.sun.star.GraphicObject:"
// ---------------------------
commit a27bad586b418e566ba88cd7f99ccb45dbc1282f
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Fri Apr 27 00:52:19 2012 +0900
removed dead code
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 39a7709..08762bb 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -508,20 +508,6 @@ sal_Bool
EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
if ( rPropVal.Value >>= rDestinationHandle.aPolar )
rDestinationHandle.nFlags |= HANDLE_FLAGS_POLAR;
}
-/* seems not to be used.
- else if ( rPropVal.Name.equals( sMap ) )
- {
- com::sun::star::drawing::EnhancedCustomShapeParameterPair aMap;
- if ( rPropVal.Value >>= aMap )
- {
- if ( GetValueForEnhancedCustomShapeHandleParameter( nXMap,
aMap.First ) )
- rDestinationHandle.Flags |= 0x800;
- if ( GetValueForEnhancedCustomShapeHandleParameter( nYMap,
aMap.Second ) )
- rDestinationHandle.Flags |= 0x1000;
- rDestinationHandle.Flags |= 0x10;
- }
- }
-*/
else if ( rPropVal.Name.equals( sRefX ) )
{
if ( rPropVal.Value >>= rDestinationHandle.nRefX )
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index cfb8c41..5be4546 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -240,21 +240,6 @@ void SetTemporary( ::com::sun::star::uno::Reference<
::com::sun::star::drawing::
SvxShape* pShape = SvxShape::getImplementation( xShape );
if ( pShape )
pShape->TakeSdrObjectOwnership();
-/*
- ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes > xShapes( xShape,
::com::sun::star::uno::UNO_QUERY );
- if ( xShapes.is() )
- {
- sal_Int32 i;
- for ( i = 0; i < xShapes->getCount(); i++ )
- {
- ::com::sun::star::uno::Any aAny( xShapes->getByIndex( i ) );
- ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > xShape;
- if ( aAny >>= xShape )
- SetTemporary( xShape );
- }
- }
-*/
}
}
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index b0ede74..4bc2cd3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -33,42 +33,6 @@
static const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min();
-/*
-static const SvxMSDffVertPair Vert[] =
-{
- { 0, 0, }
-};
-static const sal_uInt16 Segm[] =
-{
- 0x4000,
- 0x8000
-};
-static const SvxMSDffCalculationData Calc[] =
-{
- { 0x0000, 0, 0, 0 }
-};
-static const sal_Int32 Default[] =
-{
- 0
-};
-static const SvxMSDffTextRect TextRect[] =
-{
- { { 0, 0 }, { 0, 0 } }
-};
-static const mso_CustomShape mso =
-{
- (SvxMSDffVertPair*)mso_sptVert, SAL_N_ELEMENTS( mso_sptVert ),
- (sal_uInt16*)mso_sptSegm, sizeof( mso_sptSegm ) >> 1,
- (SvxMSDffCalculationData*)mso_sptCalc, SAL_N_ELEMENTS( mso_sptCalc ),
- (sal_Int32*)mso_sptDefault,
- (SvxMSDffTextRectangles*)mso_sptTextRect, SAL_N_ELEMENTS( mso_sptTextRect
),
- 21600, 21600,
- MIN_INT32, MIN_INT32,
- (SvxMSDffVertPair*)mso_sptVert, SAL_N_ELEMENTS( mso_sptVert ),
- (SvxMSDffHandles*)mso_sptHandles, SAL_N_ELEMENTS( mso_sptHandles )
-};
-*/
-
static const sal_Int32 mso_sptDefault0[] =
{
1, 0
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 17cc1e6..6779a01 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -576,11 +576,6 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
mpOutliner->SetTextObjNoInit( pTextObj );
-/*
- mpOutliner = SdrMakeOutliner( nOutlMode, pModel );
- Outliner& aDrawOutliner = pModel->GetDrawOutliner();
- mpOutliner->SetCalcFieldValueHdl(
aDrawOutliner.GetCalcFieldValueHdl() );
-*/
if( mbIsLocked )
{
((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode(
sal_False );
@@ -588,7 +583,6 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo(
sal_False );
}
-// -
if ( !m_xLinguServiceManager.is() )
{
css::uno::Reference< css::lang::XMultiServiceFactory > xMgr(
::comphelper::getProcessServiceFactory() );
@@ -602,7 +596,6 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( xHyphenator.is() )
mpOutliner->SetHyphenator( xHyphenator );
}
-// -
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 18745ef..813f1b0 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3669,22 +3669,6 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone(
SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16
nVer ) const
-//{
-// return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem(
rIn, nVer ) );
-//}
-
-//------------------------------------------------------------------------
-
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16
nItemVersion ) const
-//{
-// XFillGradientItem::Store( rOut, nItemVersion );
-// rOut << bEnabled;
-// return rOut;
-//}
-
-//------------------------------------------------------------------------
-
sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16
nFileFormatVersion ) const
{
// !!! if version number of this object must be increased, please !!!
commit 616e76ef2cd76df739ec88a3d7ee4fb709bc9b8a
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Apr 26 23:56:51 2012 +0900
removed unused header
diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx
deleted file mode 100644
index ca41784..0000000
--- a/svx/inc/svdpomv.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#error dieser Header entfaellt nun!
-
-#ifndef _SVDPOMV_HXX
-#define _SVDPOMV_HXX
-
-#include <svx/svdmrkv.hxx>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@ @@@@ @@ @@ @@ @@ @@ @@@@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@
@@
-// @@ @@ @@ @@ @@ @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@ @@
-// @@@@@ @@ @@ @@ @@@@ @@@@@@@ @@@@@@ @@@@@ @@@@ @@@@@ @@ @@@@
@@@@@@@
-// @@ @@ @@ @@ @@ @@ @ @@ @@ @@ @@ @@ @@ @@ @@@ @@ @@ @@@
@@@
-// @@ @@@@ @@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@ @@@@@ @@
@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class SdrPolyMarkView: public SdrMarkView {
-private:
-#ifndef _SVDRAW_HXX
- void ImpClearVars();
-#endif
-public:
- SdrPolyMarkView(SdrModel* pModel1, OutputDevice* pOut = 0L);
- ~SdrPolyMarkView();
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif //_SVDPOMV_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
