[ooo-build-commit] .: editeng/inc editeng/source sfx2/inc sfx2/source svx/inc xmloff/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 07:59:57 PDT 2010
editeng/inc/editeng/AccessibleEditableTextPara.hxx | 3
editeng/inc/editeng/numitem.hxx | 22 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 11
editeng/source/accessibility/AccessibleParaManager.cxx | 3
editeng/source/editeng/impedit.cxx | 11
editeng/source/items/numitem.cxx | 193 +-----------
editeng/source/outliner/outleeng.cxx | 35 --
editeng/source/outliner/outliner.cxx | 15
editeng/source/outliner/outlvw.cxx | 6
sfx2/inc/sfx2/linksrc.hxx | 4
sfx2/inc/sfx2/lnkbase.hxx | 4
sfx2/inc/sfx2/printopt.hxx | 7
sfx2/source/appl/linksrc.cxx | 4
sfx2/source/appl/lnkbase2.cxx | 3
sfx2/source/appl/sfxhelp.cxx | 25 -
sfx2/source/dialog/printopt.cxx | 61 ---
svx/inc/svdstr.hrc | 55 ---
xmloff/source/transform/TransformerBase.cxx | 17 -
18 files changed, 56 insertions(+), 423 deletions(-)
New commits:
commit 50f1eb0fc5fd8dd4dc7e62814ae8948c4da9160c
Author: David Hobley <davidh at sharpblue.org>
Date: Mon Oct 4 16:20:36 2010 +0200
Comment cleanup
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index 3bf8638..14b3369 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -79,13 +79,12 @@ namespace accessibility
public:
/// Create accessible object for given parent
- // --> OD 2006-01-11 #i27138#
+ // #i27138#
// - add parameter <_pParaManager> (default value NULL)
// This has to be the the instance of <AccessibleParaManager>, which
// created and manages this accessible paragraph.
AccessibleEditableTextPara ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rParent,
const AccessibleParaManager* _pParaManager = NULL );
- // <--
virtual ~AccessibleEditableTextPara ();
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 48d91bb..54cfe35 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -103,7 +103,6 @@ public:
class EDITENG_DLLPUBLIC SvxNumberFormat : public SvxNumberType
{
public:
- // --> OD 2008-01-08 #newlistlevelattrs#
enum SvxNumPositionAndSpaceMode
{
LABEL_WIDTH_AND_POSITION,
@@ -115,7 +114,6 @@ public:
SPACE,
NOTHING
};
- // <--
private:
String sPrefix;
@@ -130,7 +128,6 @@ private:
USHORT nBulletRelSize; //proz. Groesse des Bullets
Color nBulletColor; //Bullet color
- // --> OD 2008-01-08 #newlistlevelattrs#
// mode indicating, if the position and spacing of the list label is
// determined by the former attributes (nFirstLineOffset, nAbsLSpace,
// nLSpace and nCharTextDistance) called position and spacing via label
@@ -141,14 +138,12 @@ private:
// Note 2: The values of the former attributes are treated as 0, if mode
// LABEL_ALIGNMENT is active.
SvxNumPositionAndSpaceMode mePositionAndSpaceMode;
- // <--
short nFirstLineOffset; //Erstzeileneinzug
short nAbsLSpace; //Abstand Rand<->Nummer
short nLSpace; //relative Einrueckung zum Vorgaenger
short nCharTextDistance; //Abstand Nummer<->Text
- // --> OD 2008-01-08 #newlistlevelattrs#
// specifies what follows the list label before the text of the first line
// of the list item starts
SvxNumLabelFollowedBy meLabelFollowedBy;
@@ -158,7 +153,6 @@ private:
long mnFirstLineIndent;
// specifies the indent before the text, e.g. in L2R-layout the left margin
long mnIndentAt;
- // <--
SvxBrushItem* pGraphicBrush; //
sal_Int16 eVertOrient; // vert. Ausrichtung einer Bitmap
@@ -173,10 +167,8 @@ private:
DECL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void * );
virtual void NotifyGraphicArrived();
public:
- // --> OD 2008-01-09 #newlistlevelattrs#
SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
- // <--
SvxNumberFormat(const SvxNumberFormat& rFormat);
SvxNumberFormat(SvStream &rStream);
@@ -220,29 +212,18 @@ public:
void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;}
const Size& GetGraphicSize() const {return aGraphicSize;}
- // --> OD 2008-01-09 #newlistlevelattrs#
SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const;
void SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode );
- // <--
void SetLSpace(short nSet) {nLSpace = nSet;}
- // --> OD 2008-01-09 #newlistlevelattrs#
short GetLSpace() const;
- // <--
void SetAbsLSpace(short nSet) {nAbsLSpace = nSet;}
- // --> OD 2008-01-09 #newlistlevelattrs#
short GetAbsLSpace() const;
- // <--
void SetFirstLineOffset(short nSet) { nFirstLineOffset = nSet;}
- // --> OD 2008-01-09 #newlistlevelattrs#
short GetFirstLineOffset() const;
- // <--
void SetCharTextDistance(short nSet) { nCharTextDistance = nSet; }
- // --> OD 2008-01-09 #newlistlevelattrs#
short GetCharTextDistance() const;
- // <--
- // --> OD 2008-01-09 #newlistlevelattrs#
void SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy );
SvxNumLabelFollowedBy GetLabelFollowedBy() const;
void SetListtabPos( const long nListtabPos );
@@ -251,7 +232,6 @@ public:
long GetFirstLineIndent() const;
void SetIndentAt( const long nIndentAt );
long GetIndentAt() const;
- // <--
static Size GetGraphicSizeMM100(const Graphic* pGraphic);
static String CreateRomanString( ULONG nNo, BOOL bUpper );
@@ -278,7 +258,6 @@ class EDITENG_DLLPUBLIC SvxNumRule
static sal_Int32 nRefCount;
com::sun::star::lang::Locale aLocale;
public:
- // --> OD 2008-02-11 #newlistlevelattrs#
SvxNumRule( ULONG nFeatures,
USHORT nLevels,
BOOL bCont,
@@ -286,7 +265,6 @@ public:
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
- // <--
SvxNumRule(const SvxNumRule& rCopy);
SvxNumRule(SvStream &rStream);
virtual ~SvxNumRule();
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 1ead09c..dbbc8f2 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -114,7 +114,7 @@ namespace accessibility
DBG_NAME( AccessibleEditableTextPara )
- // --> OD 2006-01-11 #i27138# - add parameter <_pParaManager>
+ // #i27138# - add parameter <_pParaManager>
AccessibleEditableTextPara::AccessibleEditableTextPara(
const uno::Reference< XAccessible >& rParent,
const AccessibleParaManager* _pParaManager )
@@ -130,9 +130,8 @@ namespace accessibility
// exceptions, thus no chance for exceptions once the Id is
// fetched. Nevertheless, normally should employ RAII here...
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient()),
- // --> OD 2006-01-11 #i27138#
+ // #i27138#
mpParaManager( _pParaManager )
- // <--
{
#ifdef DBG_UTIL
DBG_CTOR( AccessibleEditableTextPara, NULL );
@@ -939,7 +938,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- // --> OD 2006-01-11 #i27138# - provide relations CONTENT_FLOWS_FROM
+ // #i27138# - provide relations CONTENT_FLOWS_FROM
// and CONTENT_FLOWS_TO
if ( mpParaManager )
{
@@ -977,7 +976,6 @@ namespace accessibility
// no relations, therefore empty
return uno::Reference< XAccessibleRelationSet >();
}
- // <--
}
uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException)
@@ -1129,7 +1127,7 @@ namespace accessibility
return aPoint;
}
- // --> OD 2009-12-16 #i88070#
+ // #i88070#
// fallback to parent's <XAccessibleContext> instance
else
{
@@ -1148,7 +1146,6 @@ namespace accessibility
}
}
}
- // <--
}
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot access parent")),
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 6ce6eda..201cc84 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -195,9 +195,8 @@ namespace accessibility
if( !IsReferencable( nParagraphIndex ) )
{
// there is no hard reference available, create object then
- // --> OD 2006-01-11 #i27138#
+ // #i27138#
AccessibleEditableTextPara* pChild = new AccessibleEditableTextPara( xFrontEnd, this );
- // <--
uno::Reference< XAccessible > xChild( static_cast< ::cppu::OWeakObject* > (pChild), uno::UNO_QUERY );
if( !xChild.is() )
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index a6c4be7..28a77cb 100755
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -72,7 +72,7 @@ inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiff
rPoint = pOutDev->PixelToLogic( rPoint );
}
- // ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
// class ImpEditView
// ----------------------------------------------------------------------
ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
@@ -183,7 +183,6 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
ContentNode* pEndNode = aTmpSel.Max().GetNode();
sal_uInt16 nStartPara = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( pStartNode );
sal_uInt16 nEndPara = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( pEndNode );
- // ueber die Absaetze iterieren....
for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
ParaPortion* pTmpPortion = pEditEngine->pImpEditEngine->GetParaPortions().SaveGetObject( nPara );
@@ -206,7 +205,6 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
if ( nPara == nEndPara )
nEndLine = pTmpPortion->GetLines().FindLine( aTmpSel.Max().GetIndex(), sal_True );
- // ueber die Zeilen iterieren....
for ( sal_uInt16 nLine = nStartLine; nLine <= nEndLine; nLine++ )
{
EditLine* pLine = pTmpPortion->GetLines().GetObject( nLine );
@@ -846,10 +844,8 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
GetCursor()->SetOrientation( 2700 );
}
else
- // --> FME 2004-10-18 #i32593#
- // Reset correct orientation in horizontal layout
+ // #i32593# Reset correct orientation in horizontal layout
GetCursor()->SetOrientation( 0 );
- // <--
GetCursor()->SetSize( aCursorSz );
@@ -1448,7 +1444,7 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
// aTmpNewSel: Diff zwischen alt und neu, nicht die neue Selektion
EditSelection aTmpNewSel( GetEditSelection().Max(), aPaM );
- // --> OD 2005-12-16 #i27299#
+ // #i27299#
// work on copy of current selection and set new selection, if it has changed.
EditSelection aNewEditSelection( GetEditSelection() );
@@ -1469,7 +1465,6 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
{
SetEditSelection( aNewEditSelection );
}
- // <--
BOOL bForceCursor = ( pDragAndDropInfo ? FALSE : TRUE ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
ShowCursor( bGotoCursor, bForceCursor );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index fd4ccfa..cb872a2 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -88,44 +88,34 @@ void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumb
}
}
}
-/* -----------------------------22.02.01 14:24--------------------------------
- ---------------------------------------------------------------------------*/
SvxNumberType::SvxNumberType(sal_Int16 nType) :
nNumType(nType),
bShowSymbol(sal_True)
{
nRefCount++;
}
-/* -----------------------------22.02.01 14:31--------------------------------
- ---------------------------------------------------------------------------*/
SvxNumberType::SvxNumberType(const SvxNumberType& rType) :
nNumType(rType.nNumType),
bShowSymbol(rType.bShowSymbol)
{
nRefCount++;
}
-/* -----------------------------22.02.01 14:24--------------------------------
- ---------------------------------------------------------------------------*/
SvxNumberType::~SvxNumberType()
{
if(!--nRefCount)
xFormatter = 0;
}
-/* -----------------------------22.02.01 11:09--------------------------------
- ---------------------------------------------------------------------------*/
String SvxNumberType::GetNumStr( ULONG nNo ) const
{
LanguageType eLang = Application::GetSettings().GetLanguage();
Locale aLocale = SvxCreateLocale(eLang);
return GetNumStr( nNo, aLocale );
}
-/* -----------------28.10.98 15:56-------------------
- *
- * --------------------------------------------------*/
+
String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
{
lcl_getFormatter(xFormatter);
@@ -167,13 +157,9 @@ String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
}
return aTmpStr;
}
-/* -----------------27.10.98 10:33-------------------
- *
- * --------------------------------------------------*/
-// --> OD 2008-01-09 #newlistlevelattrs#
+
SvxNumberFormat::SvxNumberFormat( sal_Int16 eType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode )
-// <--
: SvxNumberType(eType),
eNumAdjust(SVX_ADJUST_LEFT),
nInclUpperLevels(0),
@@ -181,48 +167,36 @@ SvxNumberFormat::SvxNumberFormat( sal_Int16 eType,
cBullet(SVX_DEF_BULLET),
nBulletRelSize(100),
nBulletColor(COL_BLACK),
- // --> OD 2008-01-09 #newlistlevelattrs#
mePositionAndSpaceMode( ePositionAndSpaceMode ),
- // <--
nFirstLineOffset(0),
nAbsLSpace(0),
nLSpace(0),
nCharTextDistance(0),
- // --> OD 2008-01-09 #newlistlevelattrs#
meLabelFollowedBy( LISTTAB ),
mnListtabPos( 0 ),
mnFirstLineIndent( 0 ),
mnIndentAt( 0 ),
- // <--
pGraphicBrush(0),
eVertOrient(text::VertOrientation::NONE),
pBulletFont(0)
{
}
-/* -----------------27.10.98 10:56-------------------
- *
- * --------------------------------------------------*/
+
SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat& rFormat) :
SvxNumberType(rFormat),
- // --> OD 2008-01-09 #newlistlevelattrs#
mePositionAndSpaceMode( rFormat.mePositionAndSpaceMode ),
- // <--
pGraphicBrush(0),
pBulletFont(0)
{
*this = rFormat;
}
-/* -----------------27.10.98 10:56-------------------
- *
- * --------------------------------------------------*/
+
SvxNumberFormat::~SvxNumberFormat()
{
delete pGraphicBrush;
delete pBulletFont;
}
-/* -----------------08.12.98 11:14-------------------
- *
- * --------------------------------------------------*/
+
SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
: mePositionAndSpaceMode( LABEL_WIDTH_AND_POSITION ),
meLabelFollowedBy( LISTTAB ),
@@ -328,9 +302,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
mnIndentAt = nLong;
}
}
-/* -----------------08.12.98 11:14-------------------
- *
- * --------------------------------------------------*/
+
SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)
{
if(pConverter && pBulletFont)
@@ -401,9 +373,6 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
return rStream;
}
-/* -----------------------------23.02.01 11:10--------------------------------
-
- ---------------------------------------------------------------------------*/
SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
{
SetNumberingType(rFormat.GetNumberingType());
@@ -411,19 +380,15 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
nInclUpperLevels = rFormat.nInclUpperLevels ;
nStart = rFormat.nStart ;
cBullet = rFormat.cBullet ;
- // --> OD 2008-01-09 #newlistlevelattrs#
mePositionAndSpaceMode = rFormat.mePositionAndSpaceMode;
- // <--
nFirstLineOffset = rFormat.nFirstLineOffset;
nAbsLSpace = rFormat.nAbsLSpace ;
nLSpace = rFormat.nLSpace ;
nCharTextDistance = rFormat.nCharTextDistance ;
- // --> OD 2008-01-09 #newlistlevelattrs#
meLabelFollowedBy = rFormat.meLabelFollowedBy;
mnListtabPos = rFormat.mnListtabPos;
mnFirstLineIndent = rFormat.mnFirstLineIndent;
mnIndentAt = rFormat.mnIndentAt;
- // <--
eVertOrient = rFormat.eVertOrient ;
sPrefix = rFormat.sPrefix ;
sSuffix = rFormat.sSuffix ;
@@ -443,9 +408,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
pBulletFont = new Font(*rFormat.pBulletFont);
return *this;
}
-/* -----------------27.10.98 10:56-------------------
- *
- * --------------------------------------------------*/
+
BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
{
if( GetNumberingType() != rFormat.GetNumberingType() ||
@@ -453,19 +416,15 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
nInclUpperLevels != rFormat.nInclUpperLevels ||
nStart != rFormat.nStart ||
cBullet != rFormat.cBullet ||
- // --> OD 2008-01-09 #newlistlevelattrs#
mePositionAndSpaceMode != rFormat.mePositionAndSpaceMode ||
- // <--
nFirstLineOffset != rFormat.nFirstLineOffset ||
nAbsLSpace != rFormat.nAbsLSpace ||
nLSpace != rFormat.nLSpace ||
nCharTextDistance != rFormat.nCharTextDistance ||
- // --> OD 2008-01-09 #newlistlevelattrs#
meLabelFollowedBy != rFormat.meLabelFollowedBy ||
mnListtabPos != rFormat.mnListtabPos ||
mnFirstLineIndent != rFormat.mnFirstLineIndent ||
mnIndentAt != rFormat.mnIndentAt ||
- // <--
eVertOrient != rFormat.eVertOrient ||
sPrefix != rFormat.sPrefix ||
sSuffix != rFormat.sSuffix ||
@@ -494,9 +453,7 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
}
return TRUE;
}
-/* -----------------28.10.98 09:53-------------------
- *
- * --------------------------------------------------*/
+
void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
const Size* pSize, const sal_Int16* pOrient)
{
@@ -521,9 +478,7 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
else
aGraphicSize.Width() = aGraphicSize.Height() = 0;
}
-/* -----------------28.10.98 09:59-------------------
- *
- * --------------------------------------------------*/
+
void SvxNumberFormat::SetGraphic( const String& rName )
{
const String* pName;
@@ -541,30 +496,23 @@ void SvxNumberFormat::SetGraphic( const String& rName )
aGraphicSize.Width() = aGraphicSize.Height() = 0;
}
-/* -----------------------------22.02.01 15:55--------------------------------
- ---------------------------------------------------------------------------*/
void SvxNumberFormat::SetVertOrient(sal_Int16 eSet)
{
eVertOrient = eSet;
}
-/* -----------------------------22.02.01 15:55--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int16 SvxNumberFormat::GetVertOrient() const
{
return eVertOrient;
}
-/* -----------------28.10.98 09:59-------------------
- *
- * --------------------------------------------------*/
+
void SvxNumberFormat::SetBulletFont(const Font* pFont)
{
delete pBulletFont;
pBulletFont = pFont ? new Font(*pFont): 0;
}
-// --> OD 2008-01-09 #newlistlevelattrs#
SvxNumberFormat::SvxNumPositionAndSpaceMode SvxNumberFormat::GetPositionAndSpaceMode() const
{
return mePositionAndSpaceMode;
@@ -576,38 +524,22 @@ void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePosit
short SvxNumberFormat::GetLSpace() const
{
-//#if OSL_DEBUG_LEVEL > 1
-// DBG_ASSERT( mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION,
-// "<SvxNumberFormat::GetLSpace()> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION");
-//#endif
return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION ? nLSpace : 0;
}
short SvxNumberFormat::GetAbsLSpace() const
{
-//#if OSL_DEBUG_LEVEL > 1
-// DBG_ASSERT( mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION,
-// "<SvxNumberFormat::GetAbsLSpace()> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION");
-//#endif
return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
? nAbsLSpace
: static_cast<short>( GetFirstLineIndent() + GetIndentAt() );
}
short SvxNumberFormat::GetFirstLineOffset() const
{
-//#if OSL_DEBUG_LEVEL > 1
-// DBG_ASSERT( mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION,
-// "<SvxNumberFormat::GetFirstLineOffset()> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION");
-//#endif
return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
? nFirstLineOffset
: static_cast<short>( GetFirstLineIndent() );
}
short SvxNumberFormat::GetCharTextDistance() const
{
-//#if OSL_DEBUG_LEVEL > 1
-// DBG_ASSERT( mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION,
-// "<SvxNumberFormat::GetCharTextDistance()> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION");
-//#endif
return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION ? nCharTextDistance : 0;
}
@@ -643,11 +575,7 @@ long SvxNumberFormat::GetIndentAt() const
{
return mnIndentAt;
}
-// <--
-/* -----------------28.10.98 10:03-------------------
- *
- * --------------------------------------------------*/
IMPL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void *, EMPTYARG )
{
// ggfs. die GrfSize setzen:
@@ -660,16 +588,11 @@ IMPL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void *, EMPTYARG )
pThis->NotifyGraphicArrived();
return 0;
}
-/* -----------------------------02.07.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
void SvxNumberFormat::NotifyGraphicArrived()
{
}
-/* -----------------28.10.98 10:38-------------------
- *
- * --------------------------------------------------*/
Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
{
const MapMode aMapMM100( MAP_100TH_MM );
@@ -687,9 +610,7 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
aRetSize = OutputDevice::LogicToLogic( rSize, pGraphic->GetPrefMapMode(), aMapMM100 );
return aRetSize;
}
-/* -----------------28.10.98 15:57-------------------
- *
- * --------------------------------------------------*/
+
String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
{
nNo %= 4000; // mehr kann nicht dargestellt werden
@@ -769,20 +690,15 @@ void SvxNumberFormat::GetCharStrN( ULONG nNo, String& rStr ) const
rStr.Fill( (USHORT)(nNo / coDiff) + 1, sal_Unicode(cChar) );
}
#endif //OLD_NUMBER_FORMATTING
-/* -----------------------------22.02.01 13:31--------------------------------
- ---------------------------------------------------------------------------*/
const String& SvxNumberFormat::GetCharFmtName()const
{
return sCharStyleName;
}
-/* -----------------27.10.98 10:38-------------------
- *
- * --------------------------------------------------*/
+
sal_Int32 SvxNumRule::nRefCount = 0;
static SvxNumberFormat* pStdNumFmt = 0;
static SvxNumberFormat* pStdOutlineNumFmt = 0;
-// --> OD 2008-02-11 #newlistlevelattrs#
SvxNumRule::SvxNumRule( ULONG nFeatures,
USHORT nLevels,
BOOL bCont,
@@ -805,7 +721,6 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
//daran wird zwischen writer und draw unterschieden
if(nFeatures & NUM_CONTINUOUS)
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eDefaultNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -828,7 +743,6 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
aFmts[i]->SetFirstLineIndent( cFirstLineIndent );
aFmts[i]->SetIndentAt( cIndentAt * (i+2) );
}
- // <--
}
else
{
@@ -841,9 +755,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
aFmtsSet[i] = FALSE;
}
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
+
SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
{
++nRefCount;
@@ -862,9 +774,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
aFmtsSet[i] = rCopy.aFmtsSet[i];
}
}
-/* -----------------08.12.98 11:07-------------------
- *
- * --------------------------------------------------*/
+
SvxNumRule::SvxNumRule(SvStream &rStream)
{
++nRefCount;
@@ -900,9 +810,6 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
}
}
-/* -----------------08.12.98 11:07-------------------
- *
- * --------------------------------------------------*/
SvStream& SvxNumRule::Store(SvStream &rStream)
{
rStream<<(USHORT)NUMITEM_VERSION_03;
@@ -939,9 +846,6 @@ SvStream& SvxNumRule::Store(SvStream &rStream)
return rStream;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
SvxNumRule::~SvxNumRule()
{
for(USHORT i = 0; i < SVX_MAX_NUM; i++)
@@ -952,9 +856,7 @@ SvxNumRule::~SvxNumRule()
DELETEZ(pStdOutlineNumFmt);
}
}
-/* -----------------29.10.98 16:07-------------------
- *
- * --------------------------------------------------*/
+
SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
{
nLevelCount = rCopy.nLevelCount;
@@ -972,9 +874,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
}
return *this;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
+
int SvxNumRule::operator==( const SvxNumRule& rCopy) const
{
if(nLevelCount != rCopy.nLevelCount ||
@@ -996,9 +896,7 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
}
return TRUE;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
+
const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
@@ -1007,9 +905,7 @@ const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
else
return 0;
}
-/* -----------------02.11.98 09:10-------------------
- *
- * --------------------------------------------------*/
+
const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
{
if(!pStdNumFmt)
@@ -1025,9 +921,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
*pStdNumFmt : *pStdOutlineNumFmt;
}
-/* -----------------29.10.98 09:08-------------------
- *
- * --------------------------------------------------*/
+
void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid )
{
DBG_ASSERT(i < SVX_MAX_NUM, "falsches Level" );
@@ -1037,12 +931,9 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal
delete aFmts[ i ];
aFmts[ i ] = new SvxNumberFormat( rNumFmt );
aFmtsSet[i] = bIsValid;
-// bInvalidRuleFlag = TRUE;
}
}
-/* -----------------30.10.98 12:44-------------------
- *
- * --------------------------------------------------*/
+
void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
@@ -1059,9 +950,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
}
}
}
-/* -----------------28.10.98 15:38-------------------
- *
- * --------------------------------------------------*/
+
String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const
{
String aStr;
@@ -1119,9 +1008,8 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
}
return aStr;
}
-/* -----------------18.08.99 10:18-------------------
- Description: changes linked to embedded bitmaps
- --------------------------------------------------*/
+
+// changes linked to embedded bitmaps
BOOL SvxNumRule::UnLinkGraphics()
{
BOOL bRet = FALSE;
@@ -1153,18 +1041,12 @@ BOOL SvxNumRule::UnLinkGraphics()
return bRet;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) :
SfxPoolItem(SID_ATTR_NUMBERING_RULE),
pNumRule(new SvxNumRule(rRule))
{
}
-/*-----------------23.11.98 10:36-------------------
- MT: Das sind ja sehr sinnige Kommentare...
---------------------------------------------------*/
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
SfxPoolItem(_nWhich),
pNumRule(new SvxNumRule(rRule))
@@ -1176,56 +1058,38 @@ SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
return SfxPoolItem::Create(s, n );
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
SvxNumBulletItem::SvxNumBulletItem(const SvxNumBulletItem& rCopy) :
SfxPoolItem(rCopy.Which())
{
pNumRule = new SvxNumRule(*rCopy.pNumRule);
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
+
SvxNumBulletItem::~SvxNumBulletItem()
{
delete pNumRule;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
int SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const
{
return *pNumRule == *((SvxNumBulletItem&)rCopy).pNumRule;
}
-/* -----------------27.10.98 10:41-------------------
- *
- * --------------------------------------------------*/
+
SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
{
return new SvxNumBulletItem(*this);
}
-/* -----------------08.12.98 10:43-------------------
- *
- * --------------------------------------------------*/
+
USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
{
return NUMITEM_VERSION_03;
}
-/* -----------------08.12.98 10:43-------------------
- *
- * --------------------------------------------------*/
+
SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
{
pNumRule->Store(rStream);
return rStream;
}
-/* -----------------08.12.98 10:43-------------------
- *
- * --------------------------------------------------*/
-
sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= SvxCreateNumRule( pNumRule );
@@ -1258,9 +1122,6 @@ sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
return sal_False;
}
-/* -----------------08.12.98 10:43-------------------
- *
- * --------------------------------------------------*/
SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
{
const USHORT nSrcLevels = pRule->GetLevelCount();
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 820492f..7ee1c17 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -157,7 +157,6 @@ XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
}
}
-// #101498#
void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen,
const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
@@ -169,37 +168,6 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rTex
const Color& rOverlineColor,
const Color& rTextLineColor)
{
- // why do bullet here at all? Just use GetEditEnginePtr()->PaintingFirstLine
- // inside of ImpEditEngine::Paint which calls pOwner->PaintBullet with the correct
- // values for hor and ver. No change for not-layouting (painting).
- // changed, bullet rendering now using PaintBullet via
-/* if ( nIndex == 0 )
- {
- // Dann das Bullet 'malen', dort wird bStrippingPortions ausgewertet
- // und Outliner::DrawingText gerufen
-
- // DrawingText liefert die BaseLine, DrawBullet braucht Top().
-
- if(true)
- {
- // ##
- // another error: This call happens when only stripping, but the position
- // is already aligned to text output. For bullet rendering, it needs to be reset
- // to the correct value in x and y. PaintBullet takes care of X-start offset itself
- const Point aDocPosTopLeft(GetDocPosTopLeft( nPara ));
- const Point aCorrectedPos(rStartPos.X() - aDocPosTopLeft.X(), aDocPosTopLeft.Y() + GetFirstLineOffset( nPara ));
- pOwner->PaintBullet( nPara, aCorrectedPos, Point(), 0, GetRefDevice() );
- }
- else
- {
- Point aCorrectedPos( rStartPos );
- aCorrectedPos.Y() = GetDocPosTopLeft( nPara ).Y();
- aCorrectedPos.Y() += GetFirstLineOffset( nPara );
- pOwner->PaintBullet( nPara, aCorrectedPos, Point(), 0, GetRefDevice() );
- }
- } */
-
- // #101498#
pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nPara,nIndex,nRightToLeft,
pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor);
}
@@ -240,11 +208,10 @@ void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()) );
- // <--
if ( !IsInUndo() && IsUndoEnabled() )
pOwner->UndoActionEnd( OLUNDO_ATTR );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index dbdea97..c71d530 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -335,11 +335,10 @@ void Outliner::SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingSta
pPara->IsParaIsNumberingRestart(), pPara->IsParaIsNumberingRestart() ) );
pPara->SetNumberingStartValue( nNumberingStartValue );
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
- // <--
pEditEngine->SetModified();
}
}
@@ -363,11 +362,10 @@ void Outliner::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumb
pPara->IsParaIsNumberingRestart(), bParaIsNumberingRestart ) );
pPara->SetParaIsNumberingRestart( bParaIsNumberingRestart );
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
- // <--
pEditEngine->SetModified();
}
}
@@ -607,11 +605,10 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
ImplCheckNumBulletItem( nCurPara );
}
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
ImplCheckParagraphs( 0, (USHORT) (pParaList->GetParagraphCount()) );
- // <--
EnableUndo( bUndo );
ImplBlockInsertionCallbacks( FALSE );
@@ -654,11 +651,10 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
}
DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" );
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pParaList->GetParagraphCount()) );
- // <--
ImplBlockInsertionCallbacks( FALSE );
pEditEngine->SetUpdateMode( bUpdate );
@@ -1529,10 +1525,9 @@ void Outliner::ImplCheckParagraphs( USHORT nStart, USHORT nEnd )
{
DBG_CHKTHIS( Outliner, 0 );
- // --> OD 2009-03-10 #i100014#
+ // i100014#
// assure that the following for-loop does not loop forever
for ( USHORT n = nStart; n < nEnd; n++ )
- // <--
{
Paragraph* pPara = pParaList->GetParagraph( n );
if (pPara)
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index bf98d8b..207f295 100755
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1223,11 +1223,10 @@ void OutlinerView::ToggleBullets()
}
}
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
- // <--
pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
@@ -1257,11 +1256,10 @@ void OutlinerView::EnableBullets()
}
}
- // --> OD 2009-03-10 #i100014#
+ // #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
- // <--
pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index ae8d119..7286285 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -44,7 +44,6 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
class Window;
class String;
@@ -74,7 +73,6 @@ public:
SvLinkSource();
virtual ~SvLinkSource();
-// SvBaseLink* GetDataBaseLink() const;
BOOL HasDataLinks( const SvBaseLink* = 0 ) const;
void Closed();
@@ -124,9 +122,7 @@ public:
StreamToLoadFrom getStreamToLoadFrom();
void setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,sal_Bool bIsReadOnly );
- // --> OD 2008-06-18 #i88291#
void clearStreamToLoadFrom();
- // <--
};
SV_DECL_IMPL_REF(SvLinkSource);
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index a719411..bb34180 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -41,7 +41,6 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
namespace sfx2
@@ -170,9 +169,8 @@ public:
sal_Bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; }
- // --> OD 2008-06-18 #i88291#
+ // #i88291#
void clearStreamToLoadFrom();
- // <--
inline BOOL WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 62cc555..e65c273 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -104,9 +104,8 @@ private:
SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions );
SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
SAL_DLLPRIVATE void ImplSetAccessibleNames();
- // <--
protected:
@@ -126,10 +125,6 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-// -------------------------------
-// - TransparencyPrintWarningBox -
-// -------------------------------
-
class TransparencyPrintWarningBox : public ModalDialog
{
private:
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 01503fa..16d48e7 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -46,7 +46,6 @@ namespace sfx2
TYPEINIT0( SvLinkSource )
-/************** class SvLinkSourceTimer *********************************/
class SvLinkSourceTimer : public Timer
{
SvLinkSource * pOwner;
@@ -209,12 +208,11 @@ void SvLinkSource::setStreamToLoadFrom(const com::sun::star::uno::Reference<com:
pImpl->m_bIsReadOnly = bIsReadOnly;
}
-// --> OD 2008-06-18 #i88291#
+// #i88291#
void SvLinkSource::clearStreamToLoadFrom()
{
pImpl->m_xInputStreamToLoadFrom.clear();
}
-// <--
void SvLinkSource::Closed()
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index ea8a803..619380e 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -347,7 +347,7 @@ void SvBaseLink::SetUpdateMode( USHORT nMode )
}
}
-// --> OD 2008-06-19 #i88291#
+// #i88291#
void SvBaseLink::clearStreamToLoadFrom()
{
m_xInputStreamToLoadFrom.clear();
@@ -356,7 +356,6 @@ void SvBaseLink::clearStreamToLoadFrom()
xObj->clearStreamToLoadFrom();
}
}
-// <--
BOOL SvBaseLink::Update()
{
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d5e6f24..a97063b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -87,8 +87,6 @@ using namespace ::com::sun::star::lang;
#define ERROR_TAG String( DEFINE_CONST_UNICODE("Error: ") )
#define PATH_TAG String( DEFINE_CONST_UNICODE("\nPath: ") )
-// class NoHelpErrorBox --------------------------------------------------
-
class NoHelpErrorBox : public ErrorBox
{
public:
@@ -109,8 +107,6 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
// do nothing, because no help available
}
-// -----------------------------------------------------------------------
-
#define STARTERLIST 0
rtl::OUString HelpLocaleString()
@@ -177,17 +173,11 @@ void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
}
-// -----------------------------------------------------------------------
-
sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
{
sal_Bool bRet = sal_False;
::rtl::OUString sAnchor;
- // --> OD 2009-07-01 #159496#
- // do not release solar mutex due to crash regarding accessibility
-// ULONG nSolarCount = Application::ReleaseSolarMutex();
- // <--
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
@@ -209,15 +199,10 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
catch( ::com::sun::star::uno::Exception& )
{
}
- // --> OD 2009-07-01 #159496#
-// Application::AcquireSolarMutex( nSolarCount );
- // <--
return bRet;
}
-// -----------------------------------------------------------------------
-
class SfxHelpOptions_Impl : public utl::ConfigItem
{
private:
@@ -250,8 +235,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
return aNames;
}
-// -----------------------------------------------------------------------
-
SfxHelpOptions_Impl::SfxHelpOptions_Impl()
: ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
, m_pIds( NULL )
@@ -311,8 +294,6 @@ void SfxHelpOptions_Impl::Commit()
{
}
-// class SfxHelp_Impl ----------------------------------------------------
-
class SfxHelp_Impl
{
private:
@@ -412,8 +393,6 @@ sal_Bool SfxHelp_Impl::IsHelpInstalled()
return ( m_aModulesList.begin() != m_aModulesList.end() );
}
-// class SfxHelp ---------------------------------------------------------
-
SfxHelp::SfxHelp() :
bIsDebug( sal_False ),
@@ -966,9 +945,6 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
{
if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
{
-// SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-// if ( pHelp )
-// {
SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
if ( !pOpt->HasId( nHelpId ) )
return;
@@ -1002,7 +978,6 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
{
DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
}
-// }
}
}
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index b31b671..f52f2db 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -42,19 +42,11 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/printopt.hxx>
-// -----------
-// - statics -
-// -----------
-
static USHORT aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
static BOOL bOutputForPrinter = TRUE;
#define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ]))
-// --------------------------------
-// - SfxCommonPrintOptionsTabPage -
-// --------------------------------
-
SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, SfxResId( TP_COMMONPRINTOPTIONS ), rSet ),
@@ -107,8 +99,7 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
aReduceGradientsStripesRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl ) );
aReduceBitmapsResolutionRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl ) );
- // --> PB 2008-06-09 #i89164#
- // calculate dynamically the width of radiobutton and listbox
+ // #i89164# calculate dynamically the width of radiobutton and listbox
const long nOffset = 10;
Size aOldSize = aReduceBitmapsResolutionRB.GetSizePixel();
Size aNewSize = aReduceBitmapsResolutionRB.GetOptimalSize( WINDOWSIZE_PREFERRED );
@@ -123,24 +114,17 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
aNewSize.Width() += nOffset;
aNewSize.Height() = aOldSize.Height();
aReduceBitmapsResolutionLB.SetPosSizePixel( aPos, aNewSize );
- // <--
}
-// -----------------------------------------------------------------------------
-
SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
{
}
-// -----------------------------------------------------------------------------
-
SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
return( new SfxCommonPrintOptionsTabPage( pParent, rAttrSet ) );
}
-// -----------------------------------------------------------------------------
-
Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const
{
if ( pWindow == (Window *)&aReduceGradientsStepCountNF )
@@ -161,8 +145,6 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow )
return SfxTabPage::GetParentLabelFor( pWindow );
}
-// -----------------------------------------------------------------------------
-
BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
SvtPrintWarningOptions aWarnOptions;
@@ -187,8 +169,6 @@ BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
return bModified;
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ )
{
SvtPrintWarningOptions aWarnOptions;
@@ -209,13 +189,10 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ )
ImplUpdateControls( aPrinterOutputRB.IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
-// -----------------------------------------------------------------------------
-
int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
{
if( pItemSet )
@@ -224,8 +201,6 @@ int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
return LEAVE_PAGE;
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCurrentOptions )
{
aReduceTransparencyCB.Check( pCurrentOptions->IsReduceTransparency() );
@@ -279,8 +254,6 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
ClickReduceBitmapsCBHdl( &aReduceBitmapsCB );
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames()
{
static const String cSeparator = String::CreateFromAscii( " - " );
@@ -379,8 +352,6 @@ void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames()
aTransparencyCB.SetAccessibleName( sAccessibleName );
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOptions )
{
pCurrentOptions->SetReduceTransparency( aReduceTransparencyCB.IsChecked() );
@@ -397,8 +368,6 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
pCurrentOptions->SetConvertToGreyscales( aConvertToGreyscalesCB.IsChecked() );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -412,8 +381,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -428,8 +395,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -446,8 +411,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton )
{
(void)pButton; //unused
@@ -458,8 +421,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton )
{
(void)pButton; //unused
@@ -470,8 +431,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, Rad
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*, pButton )
{
if( pButton->IsChecked() )
@@ -479,9 +438,8 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
ImplUpdateControls( &maPrinterOptions );
bOutputForPrinter = TRUE;
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
else
ImplSaveControls( &maPrinterOptions );
@@ -489,8 +447,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton*, pButton )
{
if( pButton->IsChecked() )
@@ -498,9 +454,8 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
ImplUpdateControls( &maPrintFileOptions );
bOutputForPrinter = FALSE;
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
else
ImplSaveControls( &maPrintFileOptions );
@@ -508,10 +463,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
return 0;
}
-// -------------------------------
-// - TransparencyPrintWarningBox -
-// -------------------------------
-
TransparencyPrintWarningBox::TransparencyPrintWarningBox( Window* pParent ) :
ModalDialog( pParent, SfxResId( RID_WARN_PRINTTRANSPARENCY ) ),
aWarnFI ( this, SfxResId( FI_PRINTTRANSWARN ) ),
@@ -529,14 +480,10 @@ TransparencyPrintWarningBox::TransparencyPrintWarningBox( Window* pParent ) :
aNoBtn.SetClickHdl( LINK( this, TransparencyPrintWarningBox, ClickNoBtn ) );
}
-// -----------------------------------------------------------------------------
-
TransparencyPrintWarningBox::~TransparencyPrintWarningBox()
{
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( TransparencyPrintWarningBox, ClickNoBtn, PushButton*, pButton )
{
(void)pButton; //unused
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 46417de..b618670 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -27,7 +27,6 @@
#define SDR_ResourceBegin 2560
-////////////////////////////////////////////////////////////////////////////////////////////////////
// Achtung: Alle Strings zwischen SDR_StringCacheBegin und
// SDR_StringCacheEnd muessen buendig aneinander liegen.
//BFS06#define SDR_StringCacheBegin (SDR_ResourceBegin)
@@ -322,11 +321,10 @@
#define STR_UndoDelLayer (STR_UndoBegin +14)
#define STR_UndoMovLayer (STR_UndoBegin +15)
-// --> OD 2009-07-09 #i73249#
+// #i73249#
#define STR_UndoObjName (STR_UndoBegin +16)
#define STR_UndoObjTitle (STR_UndoBegin +17)
#define STR_UndoObjDescription (STR_UndoBegin +18)
-// <--
#define STR_UndoEnd (STR_UndoObjDescription)
@@ -416,13 +414,6 @@
#define STR_ItemNam_CAPTIONESCABS (STR_ItemNamBegin + 20)
#define STR_ItemNam_CAPTIONLINELEN (STR_ItemNamBegin + 21)
#define STR_ItemNam_CAPTIONFITLINELEN (STR_ItemNamBegin + 22)
-//BFS01#define STR_ItemNam_CAPTIONRESERVE1 (STR_ItemNamBegin + 23)
-//BFS01#define STR_ItemNam_CAPTIONRESERVE2 (STR_ItemNamBegin + 24)
-//BFS01#define STR_ItemNam_CAPTIONRESERVE3 (STR_ItemNamBegin + 25)
-//BFS01#define STR_ItemNam_CAPTIONRESERVE4 (STR_ItemNamBegin + 26)
-//BFS01#define STR_ItemNam_CAPTIONRESERVE5 (STR_ItemNamBegin + 27)
-//BFS01#define STR_ItemNamSET_CAPTION (STR_ItemNamBegin + 28)
-//BFS01#define STR_ItemNamSET_OUTLINER (STR_ItemNamBegin + 29)
#define STR_ItemNam_ECKENRADIUS (STR_ItemNamBegin + 30)
#define STR_ItemNam_TEXT_LEFTDIST (STR_ItemNamBegin + 31)
@@ -471,19 +462,6 @@
#define STR_ItemNamEnd (STR_ItemNam_SHEARANGLE)
#define STR_ItemEnd STR_ItemNamEnd
-// 64 Resource-Id's reserviert fuer kompatible Erweiterungen
-//BFS06#define STR_SvDraw_CacheReserve_Begin (STR_ItemEnd+1)
-//BFS06#define STR_SvDraw_CacheReserve_End (STR_SvDraw_CacheReserve_Begin+63)
-//BFS06#define SDR_StringCacheEnd (STR_SvDraw_CacheReserve_Begin-1)
-
-//BFS06#define STR_ErrorBegin (STR_SvDraw_CacheReserve_End+1)
-//BFS06#define STR_ErrorBegin (STR_ItemEnd+1)
-//BFS06#define STR_SvDraw_ErrorReserve_Begin (STR_ErrorBegin + 2)
-// hier ist Platz fuer 30 Eintraege
-//BFS06#define STR_SvDraw_ErrorReserve_End (STR_SvDraw_ErrorReserve_Begin + 29)
-//BFS06#define STR_ErrorEnd STR_SvDraw_ErrorReserve_End
-//BFS06#define STR_ErrorEnd (STR_ErrorBegin + 2)
-
// 22-05-98: 2 Eintraege fuer die Bitmaps von der StrErrorReserve abgeknapst
//BFS06#define BMAP_Begin (STR_ErrorEnd+1)
#define BMAP_Begin (STR_ItemEnd+1)
@@ -561,7 +539,6 @@
#define SIP_XA_FTRESERVED4 (SIP_Begin + 64)
#define SIP_XA_FTRESERVED5 (SIP_Begin + 65)
#define SIP_XA_FTRESERVED_LAST (SIP_Begin + 66)
-//BFS01#define SIP_XATTRSET_TEXT (SIP_Begin + 67)
#define SIP_SA_SHADOW (SIP_Begin + 68)
#define SIP_SA_SHADOWCOLOR (SIP_Begin + 69)
#define SIP_SA_SHADOWXDIST (SIP_Begin + 70)
@@ -569,12 +546,6 @@
#define SIP_SA_SHADOWTRANSPARENCE (SIP_Begin + 72)
#define SIP_SA_SHADOW3D (SIP_Begin + 73)
#define SIP_SA_SHADOWPERSP (SIP_Begin + 74)
-//BFS01#define SIP_SA_SHADOWRESERVE1 (SIP_Begin + 75)
-//BFS01#define SIP_SA_SHADOWRESERVE2 (SIP_Begin + 76)
-//BFS01#define SIP_SA_SHADOWRESERVE3 (SIP_Begin + 77)
-//BFS01#define SIP_SA_SHADOWRESERVE4 (SIP_Begin + 78)
-//BFS01#define SIP_SA_SHADOWRESERVE5 (SIP_Begin + 79)
-//BFS01#define SIP_SDRATTRSET_SHADOW (SIP_Begin + 80)
#define SIP_SA_CAPTIONTYPE (SIP_Begin + 81)
#define SIP_SA_CAPTIONFIXEDANGLE (SIP_Begin + 82)
#define SIP_SA_CAPTIONANGLE (SIP_Begin + 83)
@@ -585,13 +556,6 @@
#define SIP_SA_CAPTIONESCABS (SIP_Begin + 88)
#define SIP_SA_CAPTIONLINELEN (SIP_Begin + 89)
#define SIP_SA_CAPTIONFITLINELEN (SIP_Begin + 90)
-//BFS01#define SIP_SA_CAPTIONRESERVE1 (SIP_Begin + 91)
-//BFS01#define SIP_SA_CAPTIONRESERVE2 (SIP_Begin + 92)
-//BFS01#define SIP_SA_CAPTIONRESERVE3 (SIP_Begin + 93)
-//BFS01#define SIP_SA_CAPTIONRESERVE4 (SIP_Begin + 94)
-//BFS01#define SIP_SA_CAPTIONRESERVE5 (SIP_Begin + 95)
-//BFS01#define SIP_SDRATTRSET_CAPTION (SIP_Begin + 96)
-//BFS01#define SIP_SDRATTRSET_OUTLINER (SIP_Begin + 97)
#define SIP_SA_ECKENRADIUS (SIP_Begin + 98)
#define SIP_SA_TEXT_MINFRAMEHEIGHT (SIP_Begin + 99)
#define SIP_SA_TEXT_AUTOGROWHEIGHT (SIP_Begin + 100)
@@ -621,7 +585,6 @@
#define SIP_SA_AUTOGROWSIZE (SIP_Begin + 124)
#define SIP_SA_RESERVE18 (SIP_Begin + 125)
#define SIP_SA_RESERVE19 (SIP_Begin + 126)
-//BFS01#define SIP_SDRATTRSET_MISC (SIP_Begin + 127)
#define SIP_SA_EDGEKIND (SIP_Begin + 128)
#define SIP_SA_EDGENODE1HORZDIST (SIP_Begin + 129)
#define SIP_SA_EDGENODE1VERTDIST (SIP_Begin + 130)
@@ -633,15 +596,6 @@
#define SIP_SA_EDGELINE1DELTA (SIP_Begin + 136)
#define SIP_SA_EDGELINE2DELTA (SIP_Begin + 137)
#define SIP_SA_EDGELINE3DELTA (SIP_Begin + 138)
-//BFS01#define SIP_SA_EDGERESERVE02 (SIP_Begin + 139)
-//BFS01#define SIP_SA_EDGERESERVE03 (SIP_Begin + 140)
-//BFS01#define SIP_SA_EDGERESERVE04 (SIP_Begin + 141)
-//BFS01#define SIP_SA_EDGERESERVE05 (SIP_Begin + 142)
-//BFS01#define SIP_SA_EDGERESERVE06 (SIP_Begin + 143)
-//BFS01#define SIP_SA_EDGERESERVE07 (SIP_Begin + 144)
-//BFS01#define SIP_SA_EDGERESERVE08 (SIP_Begin + 145)
-//BFS01#define SIP_SA_EDGERESERVE09 (SIP_Begin + 146)
-//BFS01#define SIP_SDRATTRSET_EDGE (SIP_Begin + 147)
#define SIP_SA_MEASUREKIND (SIP_Begin + 148)
#define SIP_SA_MEASURETEXTHPOS (SIP_Begin + 149)
#define SIP_SA_MEASURETEXTVPOS (SIP_Begin + 150)
@@ -666,7 +620,6 @@
#define SIP_SA_MEASURERESERVE05 (SIP_Begin + 169)
#define SIP_SA_MEASURERESERVE06 (SIP_Begin + 170)
#define SIP_SA_MEASURERESERVE07 (SIP_Begin + 171)
-//BFS01#define SIP_SDRATTRSET_MEASURE (SIP_Begin + 172)
#define SIP_SA_CIRCKIND (SIP_Begin + 173)
#define SIP_SA_CIRCSTARTANGLE (SIP_Begin + 174)
#define SIP_SA_CIRCENDANGLE (SIP_Begin + 175)
@@ -753,15 +706,12 @@
#define SIP_SA_GRAFRESERVE4 (SIP_Begin + 255)
#define SIP_SA_GRAFRESERVE5 (SIP_Begin + 256)
#define SIP_SA_GRAFRESERVE6 (SIP_Begin + 257)
-//BFS01#define SIP_SDRATTRSET_GRAF (SIP_Begin + 258)
#define SIP_SA_MARKERS (SIP_Begin + 258)
#define SIP_SA_FINE_MARKERS (SIP_Begin + 260)
-// #100499#
#define BMP_SVXOLEOBJ (SIP_Begin + 261)
-// #101928#
#define SIP_SA_ACCESSIBILITY_MARKERS (SIP_Begin + 262)
#define STR_TABLE_ATTR (SIP_Begin + 263)
@@ -784,6 +734,3 @@
#define SIP_End (SIP_SA_ACCESSIBILITY_CROP_MARKERS)
#define SDR_ResourceEnd (SIP_End)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index b2464ed..3fc9826 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -43,9 +43,7 @@
#include "MutableAttrList.hxx"
#include "TransformerActions.hxx"
#include "ElemTransformerAction.hxx"
-// --> OD 2005-06-29 #i50322#
#include "PropertyActionsOOo.hxx"
-// <--
#ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX
#include "TransformerTokenMap.hxx"
#endif
@@ -66,8 +64,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
namespace
{
bool lcl_ConvertAttr( OUString & rOutAttribute, sal_Int32 nParam )
@@ -87,8 +83,6 @@ bool lcl_ConvertAttr( OUString & rOutAttribute, sal_Int32 nParam )
}
} // anonymous namespace
-// -----------------------------------------------------------------------------
-
XMLTransformerContext *XMLTransformerBase::CreateContext( USHORT nPrefix,
const OUString& rLocalName, const OUString& rQName )
{
@@ -613,12 +607,10 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
if( SvXMLUnitConverter::convertMeasure(nMeasure, aAttrValue, MAP_100TH_MM ) )
{
- // --> OD 2004-10-29 #i13778#,#i36248#
- // apply correct twip-to-1/100mm
+ // #i13778#,#i36248# apply correct twip-to-1/100mm
nMeasure = (sal_Int32)( nMeasure >= 0
? ((nMeasure*127L+36L)/72L)
: ((nMeasure*127L-36L)/72L) );
- // <--
rtl::OUStringBuffer aBuffer;
SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit );
@@ -775,12 +767,10 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
if( SvXMLUnitConverter::convertMeasure(nMeasure, aAttrValue, MAP_100TH_MM ) )
{
- // --> OD 2004-10-29 #i13778#,#i36248#
- // apply correct 1/100mm-to-twip conversion
+ // #i13778#,#i36248#/ apply correct 1/100mm-to-twip conversion
nMeasure = (sal_Int32)( nMeasure >= 0
? ((nMeasure*72L+63L)/127L)
: ((nMeasure*72L-63L)/127L) );
- // <--
OUStringBuffer aBuffer;
SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit );
@@ -861,7 +851,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
pMutableAttrList->SetValueByIndex( i, aBuffer.makeStringAndClear() );
}
break;
- // --> OD 2005-06-10 #i50322# - special handling for the
+ // #i50322# - special handling for the
// transparency of writer background graphics.
case XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY:
{
@@ -887,7 +877,6 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
bRename = sal_True;
}
break;
- // <--
default:
OSL_ENSURE( !this, "unknown action" );
break;
More information about the ooo-build-commit
mailing list