[Libreoffice-commits] .: 6 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc filter/source oox/source unoxml/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jun 13 03:45:18 PDT 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 14
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 2
binfilter/bf_sc/source/core/data/sc_drwlayer.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 2
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 2
binfilter/bf_sd/source/core/sd_drawdoc3.cxx | 4
binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx | 4
binfilter/bf_starmath/source/starmath_document.cxx | 2
binfilter/bf_svtools/source/misc1/svt_strmadpt.cxx | 16 -
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 2
binfilter/bf_sw/source/core/draw/sw_drawdoc.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 2
binfilter/inc/bf_svtools/instrm.hxx | 4
filter/source/graphicfilter/icgm/cgm.cxx | 73 ----
filter/source/graphicfilter/icgm/cgm.hxx | 3
filter/source/graphicfilter/icgm/class0.cxx | 50 +--
filter/source/graphicfilter/icgm/class1.cxx | 54 +--
filter/source/graphicfilter/icgm/class2.cxx | 56 +--
filter/source/graphicfilter/icgm/class3.cxx | 42 +-
filter/source/graphicfilter/icgm/class4.cxx | 93 ++---
filter/source/graphicfilter/icgm/class5.cxx | 174 +++++-----
filter/source/graphicfilter/icgm/class7.cxx | 162 +++++-----
filter/source/graphicfilter/icgm/classx.cxx | 302 +++++++++----------
filter/source/graphicfilter/icgm/main.hxx | 1
filter/source/msfilter/powerpoint/ppttoxml.cxx | 2
oox/source/core/fragmenthandler2.cxx | 2
oox/source/drawingml/shape.cxx | 4
unoxml/source/dom/document.cxx | 2
28 files changed, 487 insertions(+), 591 deletions(-)
New commits:
commit 367b42b345d9b4ef468936307fca64e67dd51fec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 09:49:04 2011 +0100
mpCommentOut never set, strip it out
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index d9d34e5..f09f3b1 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -67,7 +67,6 @@ void CGM::ImplCGMInit()
CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) :
mpGraphic ( NULL ),
- mpCommentOut ( NULL ),
mbStatus ( sal_True ),
mpOutAct ( new CGMImpressOutAct( *this, rModel ) ),
mnMode ( nMode )
@@ -79,75 +78,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) :
// ---------------------------------------------------------------
-void CGM::ImplComment( sal_uInt32 Level, const char* Description )
-{
- if ( mpCommentOut )
- {
- if ( Level == CGM_DESCRIPTION )
- {
- *mpCommentOut << " " << Description << "\n";
- }
- else
- {
- sal_Int8 nFirst, nSecond, i, nCount = 0;
- if ( mnActCount < 10000 )
- nCount++;
- if ( mnActCount < 1000 )
- nCount++;
- if ( mnActCount < 100 )
- nCount++;
- if ( mnActCount < 10 )
- nCount++;
- for ( i = 0; i <= nCount; i++ )
- *mpCommentOut << " ";
- mpCommentOut->WriteNumber( mnActCount );
-
- switch( Level & 0xff )
- {
- case CGM_UNKNOWN_LEVEL :
- *mpCommentOut << " L?";
- break;
- case CGM_UNKNOWN_COMMAND :
- *mpCommentOut << " UNKNOWN COMMAND";
- break;
- case CGM_GDSF_ONLY :
- *mpCommentOut << " LI";
- break;
- default:
- *mpCommentOut << " L";
- mpCommentOut->WriteNumber( Level & 0xff );
- break;
- }
- *mpCommentOut << " C";
- mpCommentOut->WriteNumber( mnElementClass );
- *mpCommentOut << " ID-0x";
- nFirst = ( mnElementID > 0x9F ) ? (sal_Int8)( mnElementID >> 4 ) + 'A' - 10: (sal_Int8)( mnElementID >> 4 ) + '0';
- nSecond = ( ( mnElementID & 15 ) > 9 ) ? (sal_Int8)( mnElementID & 15 ) + 'A' - 10 : (sal_Int8)( mnElementID & 15 ) + '0';
- *mpCommentOut << nFirst << nSecond;
- *mpCommentOut << " Size";
- nCount = 1;
- if ( mnElementSize < 1000000 )
- nCount++;
- if ( mnElementSize < 100000 )
- nCount++;
- if ( mnElementSize < 10000 )
- nCount++;
- if ( mnElementSize < 1000 )
- nCount++;
- if ( mnElementSize < 100 )
- nCount++;
- if ( mnElementSize < 10 )
- nCount++;
- for ( i = 0; i < nCount; i++ )
- *mpCommentOut << " ";
- mpCommentOut->WriteNumber( mnElementSize );
- *mpCommentOut << " " << Description << "\n";
- }
- }
-}
-
-// ---------------------------------------------------------------
-
CGM::~CGM()
{
@@ -166,7 +96,6 @@ CGM::~CGM()
maDefRepList.clear();
maDefRepSizeList.clear();
delete mpBitmapInUse;
- delete mpCommentOut;
delete mpChart;
delete mpOutAct;
delete pCopyOfE;
@@ -739,7 +668,7 @@ void CGM::ImplDoClass()
case 8 : ImplDoClass8(); break;
case 9 : ImplDoClass9(); break;
case 15 :ImplDoClass15(); break;
- default : ComOut( CGM_UNKNOWN_COMMAND, "" ); break;
+ default: break;
}
mnActCount++;
};
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 66243cf..a805f7e 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -38,7 +38,6 @@
#define CGM_EXPORT_IMPRESS 0x00000100
#define CGM_EXPORT_META 0x00000200
-//#define CGM_EXPORT_COMMENT 0x00000400
// ---------------------------------------------------------------
@@ -82,7 +81,6 @@ class CGM
sal_Bool mbAngReverse; // AngularDirection
Graphic* mpGraphic; // ifdef CGM_EXPORT_META
- SvStream* mpCommentOut; // ifdef CGM_EXPORT_COMMENT
sal_Bool mbStatus;
sal_Bool mbMetaFile;
@@ -165,7 +163,6 @@ class CGM
VirtualDevice* mpVirDev;
GDIMetaFile* mpGDIMetaFile;
#endif
- void ImplComment( sal_uInt32, const char* );
sal_uInt32 GetBackGroundColor();
sal_Bool IsValid() const { return mbStatus; };
sal_Bool IsFinished() const { return mbIsFinished; };
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index 25026c3..a9e0f5c 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -37,13 +37,13 @@ void CGM::ImplDoClass0()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "Begin Metafile" )
+ case 0x01 : /*Begin Metafile*/
{
ImplSetMapMode();
mbMetaFile = sal_True;
}
break;
- case 0x02 : ComOut( CGM_LEVEL1, "End MetaFile" )
+ case 0x02 : /*End MetaFile*/
{
if ( mpBitmapInUse ) // vorhandene grafik verarbeiten,
{
@@ -58,7 +58,7 @@ void CGM::ImplDoClass0()
mbMetaFile = sal_False;
}
break;
- case 0x03 : ComOut( CGM_LEVEL1, "Begin Picture" )
+ case 0x03 : /*Begin Picture*/
{
ImplDefaultReplacement();
ImplSetMapMode();
@@ -75,10 +75,10 @@ void CGM::ImplDoClass0()
}
}
break;
- case 0x04 : ComOut( CGM_LEVEL1, "Begin Picture Body" )
+ case 0x04 : /*Begin Picture Body*/
mbPictureBody = sal_True;
break;
- case 0x05 : ComOut( CGM_LEVEL1, " End Picture" )
+ case 0x05 : /* End Picture*/
{
if ( mbPicture )
{
@@ -99,40 +99,40 @@ void CGM::ImplDoClass0()
mbStatus = sal_False;
}
break;
- case 0x06 : ComOut( CGM_LEVEL2, "Begin Segment" )
+ case 0x06 : /*Begin Segment*/
pElement->bSegmentCount = sal_True;
break;
- case 0x07 : ComOut( CGM_LEVEL2, "End Segment" )
+ case 0x07 : /*End Segment*/
pElement->bSegmentCount = sal_True;
break;
- case 0x08 : ComOut( CGM_LEVEL2, "Begin Figure" )
+ case 0x08 : /*Begin Figure*/
mbFigure = sal_True;
mpOutAct->BeginFigure();
break;
- case 0x09 : ComOut( CGM_LEVEL2, "End Figure" )
+ case 0x09 : /*End Figure*/
mpOutAct->EndFigure();
mbFigure = sal_False;
break;
- case 0x0d : ComOut( CGM_LEVEL3, "Begin Protection Region" ) break;
- case 0x0e : ComOut( CGM_LEVEL3, "End Protection Region" ) break;
- case 0x0f : ComOut( CGM_LEVEL3, "Begin Compound Line" ) break;
- case 0x10 : ComOut( CGM_LEVEL3, "End Compound Line" ) break;
- case 0x11 : ComOut( CGM_LEVEL3, "Begin Compound Text Path" ) break;
- case 0x12 : ComOut( CGM_LEVEL3, "End Compound Text Path" ) break;
- case 0x13 : ComOut( CGM_LEVEL3, "Begin Tile Array" ) break; // NS
- case 0x14 : ComOut( CGM_LEVEL3, "End Tile Array" ) break; // NS
- case 0xff : ComOut( CGM_GDSF_ONLY, "Filter Setup" ) break;
- case 0xfe : ComOut( CGM_GDSF_ONLY, "Begin Block Text Region" ) break;
- case 0xfd : ComOut( CGM_GDSF_ONLY, "End Block Text Region" ) break;
- case 0xfc : ComOut( CGM_GDSF_ONLY, "Begin Group" )
+ case 0x0d : /*Begin Protection Region */break;
+ case 0x0e : /*End Protection Region */break;
+ case 0x0f : /*Begin Compound Line */break;
+ case 0x10 : /*End Compound Line */break;
+ case 0x11 : /*Begin Compound Text Path */break;
+ case 0x12 : /*End Compound Text Path */break;
+ case 0x13 : /*Begin Tile Array */break; // NS
+ case 0x14 : /*End Tile Array */break; // NS
+ case 0xff : /*Filter Setup */break;
+ case 0xfe : /*Begin Block Text Region */break;
+ case 0xfd : /*End Block Text Region */break;
+ case 0xfc : /*Begin Group*/
mpOutAct->BeginGroup();
break;
- case 0xfb : ComOut( CGM_GDSF_ONLY, "End Group" )
+ case 0xfb : /*End Group*/
mpOutAct->EndGroup();
break;
- case 0xfa : ComOut( CGM_GDSF_ONLY, "Begin Patch" ) break;
- case 0xf9 : ComOut( CGM_GDSF_ONLY, "Begin Patch" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0xfa : /*Begin Patch */break;
+ case 0xf9 : /*Begin Patch */break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx
index 726d6f3..b52e3ce 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -40,11 +40,11 @@ void CGM::ImplDoClass1()
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "Metafile Version" )
+ case 0x01 : /*Metafile Version*/
pElement->nMetaFileVersion = ImplGetI( pElement->nIntegerPrecision );
break;
- case 0x02 : ComOut( CGM_LEVEL1, "Metafile Description" ) break;
- case 0x03 : ComOut( CGM_LEVEL1, "VDC Type" )
+ case 0x02 : /*Metafile Description */break;
+ case 0x03 : /*VDC Type*/
{
nUInteger = ImplGetUI16();
switch( nUInteger )
@@ -55,7 +55,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x04 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Integer Precision" )
+ case 0x04 : /*Integer Precision*/
{
nInteger = ImplGetI( pElement->nIntegerPrecision );
switch ( nInteger )
@@ -68,7 +68,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x05 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Real Precision" )
+ case 0x05 : /*Real Precision*/
{
nUInteger = ImplGetUI16( 4 );
nI0 = ImplGetI( pElement->nIntegerPrecision ); // exponent
@@ -110,7 +110,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x06 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Index Precision" )
+ case 0x06 : /*Index Precision*/
{
nInteger = ImplGetI( pElement->nIntegerPrecision );
switch ( nInteger )
@@ -123,7 +123,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x07 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Precision" )
+ case 0x07 : /*Color Precision*/
{
nInteger = ImplGetI( pElement->nIntegerPrecision );
switch ( nInteger )
@@ -136,7 +136,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x08 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Index Precision" )
+ case 0x08 : /*Color Index Precision*/
{
nInteger = ImplGetI( pElement->nIntegerPrecision );
switch ( nInteger )
@@ -149,14 +149,14 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x09 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Maximum Colour Index" )
+ case 0x09 : /*Maximum Colour Index*/
{
pElement->nColorMaximumIndex = ImplGetUI( pElement->nColorIndexPrecision );
if ( ( pElement->nColorMaximumIndex > 256 /*255*/ ) || ( pElement->nColorMaximumIndex == 0 ) )
mbStatus = sal_False;
}
break;
- case 0x0a : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Value Extent" )
+ case 0x0a : /*Color Value Extent*/
{
if ( pElement->eColorModel == CM_RGB )
nI1 = 6;
@@ -171,8 +171,8 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x0b : ComOut( CGM_LEVEL1, "MetaFile Element List" ) break;
- case 0x0c : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "MetaFile Default Replacement" )
+ case 0x0b : /*MetaFile Element List */break;
+ case 0x0c : /*MetaFile Default Replacement*/
{
if ( mnElementSize > 1 )
{
@@ -187,7 +187,7 @@ void CGM::ImplDoClass1()
mnParaSize = mnElementSize;
}
break;
- case 0x0d : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Font List" )
+ case 0x0d : /*Font List*/
{
while ( mnParaSize < mnElementSize )
{
@@ -198,7 +198,7 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x0e : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Set List" )
+ case 0x0e : /*Character Set List*/
{
while ( mnParaSize < mnElementSize )
{
@@ -211,21 +211,21 @@ void CGM::ImplDoClass1()
}
}
break;
- case 0x0f : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Coding Announcer" )
+ case 0x0f : /*Character Coding Announcer*/
pElement->eCharacterCodingA = (CharacterCodingA)ImplGetUI16();
break;
- case 0x10 : ComOut( CGM_LEVEL2, "Name Precision" ) break; // NS
- case 0x11 : ComOut( CGM_LEVEL2, "Maximum VDC Extent" ) break; // NS
- case 0x12 : ComOut( CGM_LEVEL2, "Segment Priority Extent" ) break; // NS
- case 0x13 : ComOut( CGM_LEVEL3, "Color Model" ) break; // NS
- case 0x14 : ComOut( CGM_LEVEL3, "Color Calibration" ) break; // NS
- case 0x15 : ComOut( CGM_LEVEL3, "Font Properties" ) break; // NS
- case 0x16 : ComOut( CGM_LEVEL3, "Glyph Mapping" ) break; // NS
- case 0x17 : ComOut( CGM_LEVEL3, "Symbol Library List" ) break; // NS
- case 0xfc : ComOut( CGM_GDSF_ONLY, "Inquire Function Support" ) break;
- case 0xfa : ComOut( CGM_GDSF_ONLY, "End Metafile Defaults Replacement" ) break;
- case 0xf8 : ComOut( CGM_GDSF_ONLY, "Set Color Value Desc Extent" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0x10 : /*Name Precision */break; // NS
+ case 0x11 : /*Maximum VDC Extent */break; // NS
+ case 0x12 : /*Segment Priority Extent */break; // NS
+ case 0x13 : /*Color Model */break; // NS
+ case 0x14 : /*Color Calibration */break; // NS
+ case 0x15 : /*Font Properties */break; // NS
+ case 0x16 : /*Glyph Mapping */break; // NS
+ case 0x17 : /*Symbol Library List */break; // NS
+ case 0xfc : /*Inquire Function Support */break;
+ case 0xfa : /*End Metafile Defaults Replacement */break;
+ case 0xf8 : /*Set Color Value Desc Extent */break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx
index 3ea7628..7d70420 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -38,7 +38,7 @@ void CGM::ImplDoClass2()
sal_uInt32 nUInteger;
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Scaling Mode" )
+ case 0x01 : /*Scaling Mode*/
{
if ( mnElementSize ) // HACK (NASA.CGM)
{
@@ -53,7 +53,7 @@ void CGM::ImplDoClass2()
}
}
break;
- case 0x02 : ComOut( CGM_LEVEL1, "Color Selection Mode" )
+ case 0x02 : /*Color Selection Mode*/
{
nUInteger = ImplGetUI16();
switch( nUInteger )
@@ -64,7 +64,7 @@ void CGM::ImplDoClass2()
}
}
break;
- case 0x03 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Line Width Specification Mode" )
+ case 0x03 : /*Line Width Specification Mode*/
{
nUInteger = ImplGetUI16();
switch( nUInteger )
@@ -75,7 +75,7 @@ void CGM::ImplDoClass2()
}
}
break;
- case 0x04 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Marker Size Specification Mode" )
+ case 0x04 : /*Marker Size Specification Mode*/
{
nUInteger = ImplGetUI16();
switch( nUInteger )
@@ -86,7 +86,7 @@ void CGM::ImplDoClass2()
}
}
break;
- case 0x05 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Edge Width Specification Mode" )
+ case 0x05 : /*Edge Width Specification Mode*/
{
nUInteger = ImplGetUI16();
switch( nUInteger )
@@ -97,23 +97,23 @@ void CGM::ImplDoClass2()
}
}
break;
- case 0x06 : ComOut( CGM_LEVEL1, "VDC Extent" )
+ case 0x06 : /*VDC Extent*/
{
ImplGetRectangleNS( pElement->aVDCExtent );
ImplSetMapMode();
}
break;
- case 0x07 : ComOut( CGM_LEVEL1, "Background Color" )
+ case 0x07 : /*Background Color*/
pElement->nBackGroundColor = ImplGetBitmapColor( sal_True );
break;
- case 0x08 : ComOut( CGM_LEVEL2, "Device Viewport" )
+ case 0x08 : /*Device Viewport*/
{
if ( pElement->eVDCType == VDC_INTEGER )
ImplGetRectangle( pElement->aDeviceViewPort );
ImplSetMapMode();
}
break;
- case 0x09 : ComOut( CGM_LEVEL2, "Device Viewport Specification Mode" )
+ case 0x09 : /*Device Viewport Specification Mode*/
{
nUInteger = ImplGetUI16( 8 );
switch( nUInteger )
@@ -127,7 +127,7 @@ void CGM::ImplDoClass2()
ImplSetMapMode();
}
break;
- case 0x0a : ComOut( CGM_LEVEL2, "Device Viewport Mapping" )
+ case 0x0a : /*Device Viewport Mapping*/
{
switch( ImplGetUI16() )
{
@@ -152,7 +152,7 @@ void CGM::ImplDoClass2()
ImplSetMapMode();
}
break;
- case 0x0b : ComOut( CGM_LEVEL2, "Line Representation" )
+ case 0x0b : /*Line Representation*/
{
LineBundle aTempLineBundle;
aTempLineBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
@@ -162,7 +162,7 @@ void CGM::ImplDoClass2()
pElement->InsertBundle( pElement->aLineList, aTempLineBundle );
}
break;
- case 0x0c : ComOut( CGM_LEVEL2, "Marker Representation" )
+ case 0x0c : /*Marker Representation*/
{
MarkerBundle aTempMarkerBundle;
aTempMarkerBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
@@ -172,7 +172,7 @@ void CGM::ImplDoClass2()
pElement->InsertBundle( pElement->aMarkerList, aTempMarkerBundle );
}
break;
- case 0x0d : ComOut( CGM_LEVEL2, "Text Representation" )
+ case 0x0d : /*Text Representation*/
{
TextBundle aTempTextBundle;
aTempTextBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
@@ -184,7 +184,7 @@ void CGM::ImplDoClass2()
pElement->InsertBundle( pElement->aTextList, aTempTextBundle );
}
break;
- case 0x0e : ComOut( CGM_LEVEL2, "Fill Representation" )
+ case 0x0e : /*Fill Representation*/
{
FillBundle aTempFillBundle;
aTempFillBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
@@ -195,7 +195,7 @@ void CGM::ImplDoClass2()
pElement->InsertBundle( pElement->aFillList, aTempFillBundle );
}
break;
- case 0x0f : ComOut( CGM_LEVEL2, "Edge Representation" )
+ case 0x0f : /*Edge Representation*/
{
EdgeBundle aTempEdgeBundle;
aTempEdgeBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
@@ -205,23 +205,23 @@ void CGM::ImplDoClass2()
pElement->InsertBundle( pElement->aEdgeList, aTempEdgeBundle );
}
break;
- case 0x10 : ComOut( CGM_LEVEL3, "Interior Style Specification Mode" ) break; // NS
- case 0x11 : ComOut( CGM_LEVEL3, "Line and Edge Type Definition" ) break;
- case 0x12 : ComOut( CGM_LEVEL3, "Hatch Style Definition" ) break; // NS
- case 0x13 : ComOut( CGM_LEVEL3, "Geometric Pattern Definition" ) break; // NS
- case 0xff : ComOut( CGM_GDSF_ONLY, "inquire VDC EXTENT" ) break;
- case 0xfe : ComOut( CGM_GDSF_ONLY, "inquire Background Color" ) break;
- case 0xfd : ComOut( CGM_GDSF_ONLY, "inquire Device Viewport" ) break;
- case 0xfc : ComOut( CGM_GDSF_ONLY, "set Font Selection Mode" ) break;
- case 0xfb : ComOut( CGM_GDSF_ONLY, "inquire Color Selection Mode" ) break;
- case 0xfa : ComOut( CGM_GDSF_ONLY, "inquire Font Selection Mode" ) break;
- case 0xf9 : ComOut( CGM_GDSF_ONLY, "set Char Height Spec Mode" )
+ case 0x10 : /*Interior Style Specification Mode */break; // NS
+ case 0x11 : /*Line and Edge Type Definition */break;
+ case 0x12 : /*Hatch Style Definition */break; // NS
+ case 0x13 : /*Geometric Pattern Definition */break; // NS
+ case 0xff : /*inquire VDC EXTENT */break;
+ case 0xfe : /*inquire Background Color */break;
+ case 0xfd : /*inquire Device Viewport */break;
+ case 0xfc : /*set Font Selection Mode */break;
+ case 0xfb : /*inquire Color Selection Mode */break;
+ case 0xfa : /*inquire Font Selection Mode */break;
+ case 0xf9 : /*set Char Height Spec Mode*/
{
ImplGetUI16(); // -Wall is this really needed?
}
break;
- case 0xf8 : ComOut( CGM_GDSF_ONLY, "set Background Style" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0xf8 : /*set Background Style */break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx
index d3fd67c..37cbef8 100644
--- a/filter/source/graphicfilter/icgm/class3.cxx
+++ b/filter/source/graphicfilter/icgm/class3.cxx
@@ -40,7 +40,7 @@ void CGM::ImplDoClass3()
long nI0, nI1;
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "VDC Integer Precision" )
+ case 0x01 : /*VDC Integer Precision*/
{
switch( ImplGetI( pElement->nIntegerPrecision ) )
{
@@ -50,7 +50,7 @@ void CGM::ImplDoClass3()
}
}
break;
- case 0x02 : ComOut( CGM_LEVEL1, "VDC Real Precision" )
+ case 0x02 : /*VDC Real Precision*/
{
nUInteger = ImplGetUI16();
nI0 = ImplGetI( pElement->nIntegerPrecision ); // exponent
@@ -92,12 +92,12 @@ void CGM::ImplDoClass3()
}
}
break;
- case 0x03 : ComOut( CGM_LEVEL1, "Auxiliary Colour" )
+ case 0x03 : /*Auxiliary Colour*/
{
pElement->nAuxiliaryColor = ImplGetBitmapColor();
}
break;
- case 0x04 : ComOut( CGM_LEVEL1, "Transparency" )
+ case 0x04 : /*Transparency*/
{
switch( ImplGetUI16() )
{
@@ -107,10 +107,10 @@ void CGM::ImplDoClass3()
}
}
break;
- case 0x05 : ComOut( CGM_LEVEL1, "Clip Rectangle" )
+ case 0x05 : /*Clip Rectangle*/
ImplGetRectangle( pElement->aClipRect );
break;
- case 0x06 : ComOut( CGM_LEVEL1, "Clip Indicator" )
+ case 0x06 : /*Clip Indicator*/
{
switch( ImplGetUI16() )
{
@@ -120,25 +120,25 @@ void CGM::ImplDoClass3()
}
}
break;
- case 0x07 : ComOut( CGM_LEVEL2, "Line Clipping Mode" ) break; // NS
- case 0x08 : ComOut( CGM_LEVEL2, "Marker Clipping Mode" ) break; // NS
- case 0x09 : ComOut( CGM_LEVEL2, "Edge Clipping Mode" ) break; // NS
- case 0x0a : ComOut( CGM_LEVEL2, "New Region" )
+ case 0x07 : /*Line Clipping Mode */break; // NS
+ case 0x08 : /*Marker Clipping Mode */break; // NS
+ case 0x09 : /*Edge Clipping Mode */break; // NS
+ case 0x0a : /*New Region*/
mpOutAct->NewRegion();
break;
- case 0x0b : ComOut( CGM_LEVEL2, "Save Primitive Context" ) break; // NS
- case 0x0c : ComOut( CGM_LEVEL2, "Restore Primitive Context" ) break; // NS
- case 0x11 : ComOut( CGM_LEVEL3, "Protection Region Indicator" ) break;
- case 0x12 : ComOut( CGM_LEVEL3, "Generalized Text Path Mode" ) break; // NS
- case 0x13 : ComOut( CGM_LEVEL3, "Mitre Limit" )
+ case 0x0b : /*Save Primitive Context */break; // NS
+ case 0x0c : /*Restore Primitive Context */break; // NS
+ case 0x11 : /*Protection Region Indicator */break;
+ case 0x12 : /*Generalized Text Path Mode */break; // NS
+ case 0x13 : /*Mitre Limit*/
pElement->nMitreLimit = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
break; // NS
- case 0x14 : ComOut( CGM_LEVEL3, "Transparent Cell Color" ) break; // NS
- case 0xfc : ComOut( CGM_GDSF_ONLY, "Text Path Alignment Modes" ) break;
- case 0xfd : ComOut( CGM_GDSF_ONLY, "Pop Transformation Stack" ) break;
- case 0xfe : ComOut( CGM_GDSF_ONLY, "Push Transformation Stack" ) break;
- case 0xff : ComOut( CGM_GDSF_ONLY, "Set Patch ID" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0x14 : /*Transparent Cell Color */break; // NS
+ case 0xfc : /*Text Path Alignment Modes */break;
+ case 0xfd : /*Pop Transformation Stack */break;
+ case 0xfe : /*Push Transformation Stack */break;
+ case 0xff : /*Set Patch ID */break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index 7178d2e..7419049 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -133,7 +133,7 @@ void CGM::ImplDoClass4()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "PolyLine" )
+ case 0x01 : /*PolyLine*/
{
sal_uInt32 nPoints = mnElementSize / ImplGetPointSize();
Polygon aPolygon( (sal_uInt16)nPoints );
@@ -150,7 +150,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x02 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Disjoint PolyLine" )
+ case 0x02 : /*Disjoint PolyLine*/
{
sal_uInt16 nPoints = sal::static_int_cast< sal_uInt16 >(
mnElementSize / ImplGetPointSize());
@@ -186,8 +186,8 @@ void CGM::ImplDoClass4()
}
break;
- case 0x03 : ComOut( CGM_LEVEL1, "PolyMarker" ) break;
- case 0x04 : ComOut( CGM_LEVEL1, "Text" )
+ case 0x03 : /*PolyMarker*/ break;
+ case 0x04 : /*Text*/
{
FloatPoint aFloatPoint;
sal_uInt32 nType, nSize;
@@ -200,18 +200,15 @@ void CGM::ImplDoClass4()
nSize = ImplGetUI( 1 );
mpSource[ mnParaSize + nSize ] = 0;
- ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
awt::Size aSize;
awt::Point aPoint( (long)aFloatPoint.X, (long)aFloatPoint.Y );
mpOutAct->DrawText( aPoint, aSize,
(char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-// mnParaSize += nSize;
mnParaSize = mnElementSize;
}
break;
- case 0x05 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Restricted Text" )
+ case 0x05 : /*Restricted Text*/
{
double dx, dy;
FloatPoint aFloatPoint;
@@ -239,18 +236,15 @@ void CGM::ImplDoClass4()
mpSource[ mnParaSize + nSize ] = 0;
- ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
awt::Point aPoint( (long)aFloatPoint.X, (long)aFloatPoint.Y );
awt::Size aSize((long)dx, (long)dy);
mpOutAct->DrawText( aPoint, aSize ,
(char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-// mnParaSize += nSize;
mnParaSize = mnElementSize;
}
break;
- case 0x06 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Append Text" )
+ case 0x06 : /*Append Text*/
{
sal_uInt32 nSize;
sal_uInt32 nType = ImplGetUI16( 4 );
@@ -258,15 +252,12 @@ void CGM::ImplDoClass4()
nSize = ImplGetUI( 1 );
mpSource[ mnParaSize + nSize ] = 0;
- ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
mpOutAct->AppendText( (char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-// mnParaSize += nSize;
mnParaSize = mnElementSize;
}
break;
- case 0x07 : ComOut( CGM_LEVEL1, "Polygon" )
+ case 0x07 : /*Polygon*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -284,7 +275,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x08 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Polygon Set" )
+ case 0x08 : /*Polygon Set*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -316,7 +307,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x09 : ComOut( CGM_LEVEL1, "Cell Array" )
+ case 0x09 : /*Cell Array*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -337,7 +328,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0a : ComOut( CGM_LEVEL1, "Generalized Drawing Primitive" )
+ case 0x0a : /*Generalized Drawing Primitive*/
{
ImplGetI( pElement->nIntegerPrecision ); //-Wall is this needed
ImplGetUI( pElement->nIntegerPrecision ); //-Wall is this needed
@@ -345,7 +336,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0b : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Rectangle" )
+ case 0x0b : /*Rectangle*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -356,7 +347,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0c : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circle" )
+ case 0x0c : /*Circle*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -374,7 +365,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0d : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point" )
+ case 0x0d : /*Circular Arc 3 Point*/
{
FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint, aCenterPoint;
ImplGetPoint( aStartingPoint, sal_True );
@@ -445,7 +436,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0e : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point Close" )
+ case 0x0e : /*Circular Arc 3 Point Close*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -511,7 +502,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x0f : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre" )
+ case 0x0f : /*Circular Arc Centre*/
{
double fStartAngle, fEndAngle, vector[ 4 ];
FloatPoint aCenter, aRadius;
@@ -565,7 +556,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x10 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre Close" )
+ case 0x10 : /*Circular Arc Centre Close*/
{
double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
FloatPoint aCenter, aRadius;
@@ -610,7 +601,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x11 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Ellipse" )
+ case 0x11 : /*Ellipse*/
{
double fOrientation;
FloatPoint aCenter, aRadius;
@@ -623,7 +614,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x12 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Elliptical Arc" )
+ case 0x12 : /*Elliptical Arc*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
@@ -654,7 +645,7 @@ void CGM::ImplDoClass4()
}
break;
- case 0x13 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Elliptical Arc Close" )
+ case 0x13 : /*Elliptical Arc Close*/
{
double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
FloatPoint aCenter, aRadius;
@@ -687,43 +678,43 @@ void CGM::ImplDoClass4()
nType, fEndAngle, fStartAngle);
}
break;
- case 0x14 : ComOut( CGM_LEVEL2, "Circular Arc Centre Reversed" )
+ case 0x14 : /*Circular Arc Centre Reversed*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x15 : ComOut( CGM_LEVEL2, "Connection Edge" ) // NS
+ case 0x15 : /*Connection Edge */ // NS
{
// if ( mbFigure )
// mpOutAct->CloseRegion();
}
break;
- case 0x16 : ComOut( CGM_LEVEL3, "Hyperbolic Arc" ) // NS
+ case 0x16 : /*Hyperbolic Arc */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x17 : ComOut( CGM_LEVEL3, "Parabolic Arc" ) // NS
+ case 0x17 : /*Parabolic Arc */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x18 : ComOut( CGM_LEVEL3, "Non Uniform B-Spline" ) // NS
+ case 0x18 : /*Non Uniform B-Spline */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x19 : ComOut( CGM_LEVEL3, "Non Uniform Rational B-Spline" ) // NS
+ case 0x19 : /*Non Uniform Rational B-Spline */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1a : ComOut( CGM_LEVEL3, "Polybezier" )
+ case 0x1a : /*Polybezier*/
{
sal_uInt32 nOrder = ImplGetI( pElement->nIntegerPrecision );
@@ -767,92 +758,92 @@ void CGM::ImplDoClass4()
}
break;
- case 0x1b : ComOut( CGM_LEVEL3, "Polysymbol" ) // NS
+ case 0x1b : /*Polysymbol */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1c : ComOut( CGM_LEVEL3, "Bitonal Tile" ) // NS
+ case 0x1c : /*Bitonal Tile */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1d : ComOut( CGM_LEVEL3, "Tile" ) // NS
+ case 0x1d : /*Tile */ // NS
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0x1e : ComOut( CGM_UNKNOWN_LEVEL, "Insert Object" )
+ case 0x1e : /*Insert Object*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xff : ComOut( CGM_GDSF_ONLY, "Polybezier" )
+ case 0xff : /*Polybezier*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xfe : ComOut( CGM_GDSF_ONLY, "Sharp Polybezier" )
+ case 0xfe : /*Sharp Polybezier*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xfd : ComOut( CGM_GDSF_ONLY, "Polyspline" )
+ case 0xfd : /*Polyspline*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xfc : ComOut( CGM_GDSF_ONLY, "Reounded Rectangle" )
+ case 0xfc : /*Reounded Rectangle*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xfb : ComOut( CGM_GDSF_ONLY, "Begin Cell Array" )
+ case 0xfb : /*Begin Cell Array*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xfa : ComOut( CGM_GDSF_ONLY, "End Cell Array" )
+ case 0xfa : /*End Cell Array*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xf9 : ComOut( CGM_GDSF_ONLY, "Insert File" )
+ case 0xf9 : /*Insert File*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xf8 : ComOut( CGM_GDSF_ONLY, "Block Text" )
+ case 0xf8 : /*Block Text*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xf7 : ComOut( CGM_GDSF_ONLY, "Variable Width Polyline" )
+ case 0xf7 : /*Variable Width Polyline*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xf6 : ComOut( CGM_GDSF_ONLY, "Elliptical Arc 3 Point" )
+ case 0xf6 : /*Elliptical Arc 3 Point*/
{
if ( mbFigure )
mpOutAct->CloseRegion();
}
break;
- case 0xf1 : ComOut( CGM_GDSF_ONLY, "Hyperlink Definition" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0xf1 : /*Hyperlink Definition */break;
+ default: break;
}
}
else
diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx
index 5f12108..eea716f 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -40,10 +40,10 @@ void CGM::ImplDoClass5()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "Line Bundle Index" )
+ case 0x01 : /*Line Bundle Index*/
pElement->pLineBundle = (LineBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aLineList, pElement->aLineBundle );
break;
- case 0x02 : ComOut( CGM_LEVEL1, "Line Type" )
+ case 0x02 : /*Line Type*/
{
if ( pElement->nAspectSourceFlags & ASF_LINETYPE )
pElement->pLineBundle->eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
@@ -51,7 +51,7 @@ void CGM::ImplDoClass5()
pElement->aLineBundle.eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x03 : ComOut( CGM_LEVEL1, "Line Width" )
+ case 0x03 : /*Line Width*/
{
double nWidth;
if ( pElement->eLineWidthSpecMode == SM_ABSOLUTE )
@@ -71,7 +71,7 @@ void CGM::ImplDoClass5()
: pElement->aLineBundle.nLineWidth = nWidth;
}
break;
- case 0x04 : ComOut( CGM_LEVEL1, "Line Color" )
+ case 0x04 : /*Line Color*/
{
if ( pElement->nAspectSourceFlags & ASF_LINECOLOR )
pElement->pLineBundle->SetColor( ImplGetBitmapColor() );
@@ -79,10 +79,10 @@ void CGM::ImplDoClass5()
pElement->aLineBundle.SetColor( ImplGetBitmapColor() );
}
break;
- case 0x05 : ComOut( CGM_LEVEL1, "Marker Bundle Index" )
+ case 0x05 : /*Marker Bundle Index*/
pElement->pMarkerBundle = (MarkerBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aMarkerList, pElement->aMarkerBundle );
break;
- case 0x06 : ComOut( CGM_LEVEL1, "Marker Type" )
+ case 0x06 : /*Marker Type*/
{
if ( pElement->nAspectSourceFlags & ASF_MARKERTYPE )
pElement->pMarkerBundle->eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
@@ -90,7 +90,7 @@ void CGM::ImplDoClass5()
pElement->aMarkerBundle.eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x07 : ComOut( CGM_LEVEL1, "Marker Size" )
+ case 0x07 : /*Marker Size*/
{
double nWidth;
if ( pElement->eMarkerSizeSpecMode == SM_ABSOLUTE )
@@ -108,7 +108,7 @@ void CGM::ImplDoClass5()
: pElement->aMarkerBundle.nMarkerSize = nWidth;
}
break;
- case 0x08 : ComOut( CGM_LEVEL1, "Marker Color" )
+ case 0x08 : /*Marker Color*/
{
if ( pElement->nAspectSourceFlags & ASF_MARKERCOLOR )
pElement->pMarkerBundle->SetColor( ImplGetBitmapColor() );
@@ -116,10 +116,10 @@ void CGM::ImplDoClass5()
pElement->aMarkerBundle.SetColor( ImplGetBitmapColor() );
}
break;
- case 0x09 : ComOut( CGM_LEVEL1, "Text Bundle Index" )
+ case 0x09 : /*Text Bundle Index*/
pElement->pTextBundle = (TextBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aTextList, pElement->aTextBundle );
break;
- case 0x0a : ComOut( CGM_LEVEL1, "Text Font Index" )
+ case 0x0a : /*Text Font Index*/
{
if ( pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX )
pElement->pTextBundle->nTextFontIndex = ImplGetI( pElement->nIndexPrecision );
@@ -127,7 +127,7 @@ void CGM::ImplDoClass5()
pElement->aTextBundle.nTextFontIndex = ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x0b : ComOut( CGM_LEVEL1, "Text Precision" )
+ case 0x0b : /*Text Precision*/
{
TextBundle* pBundle;
if ( pElement->nAspectSourceFlags & ASF_TEXTPRECISION )
@@ -143,7 +143,7 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x0c : ComOut( CGM_LEVEL1, "Character Expansion Factor" )
+ case 0x0c : /*Character Expansion Factor*/
{
if ( pElement->nAspectSourceFlags & ASF_CHARACTEREXPANSION )
pElement->pTextBundle->nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
@@ -151,7 +151,7 @@ void CGM::ImplDoClass5()
pElement->aTextBundle.nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
}
break;
- case 0x0d : ComOut( CGM_LEVEL1, "Character Spacing" )
+ case 0x0d : /*Character Spacing*/
{
if ( pElement->nAspectSourceFlags & ASF_CHARACTERSPACING )
pElement->pTextBundle->nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
@@ -159,7 +159,7 @@ void CGM::ImplDoClass5()
pElement->aTextBundle.nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
}
break;
- case 0x0e : ComOut( CGM_LEVEL1, "Text Color" )
+ case 0x0e : /*Text Color*/
{
if ( pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
pElement->pTextBundle->SetColor( ImplGetBitmapColor() );
@@ -167,7 +167,7 @@ void CGM::ImplDoClass5()
pElement->aTextBundle.SetColor( ImplGetBitmapColor() );
}
break;
- case 0x0f : ComOut( CGM_LEVEL1, "Character Height" )
+ case 0x0f : /*Character Height*/
{
if ( pElement->eVDCType == VDC_INTEGER )
pElement->nCharacterHeight = ImplGetI( pElement->nVDCIntegerPrecision );
@@ -177,7 +177,7 @@ void CGM::ImplDoClass5()
pElement->nCharacterHeight /= 18.0;
}
break;
- case 0x10 : ComOut( CGM_LEVEL1, "Character Orientation" )
+ case 0x10 : /*Character Orientation*/
{
if ( pElement->eVDCType == VDC_INTEGER )
{
@@ -195,7 +195,7 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x11 : ComOut( CGM_LEVEL1, "Text Path" )
+ case 0x11 : /*Text Path*/
{
switch( ImplGetUI16() )
{
@@ -207,7 +207,7 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x12 : ComOut( CGM_LEVEL1, "Text Alignment" )
+ case 0x12 : /*Text Alignment*/
{
pElement->eTextAlignmentH = (TextAlignmentH)ImplGetUI16();
pElement->eTextAlignmentV = (TextAlignmentV)ImplGetUI16( 8 );
@@ -215,16 +215,16 @@ void CGM::ImplDoClass5()
pElement->nTextAlignmentVCont = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
}
break;
- case 0x13 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Set Index" )
+ case 0x13 : /*Character Set Index*/
pElement->nCharacterSetIndex = ImplGetI( pElement->nIndexPrecision );
break;
- case 0x14 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Alternate Character Set Index" )
+ case 0x14 : /*Alternate Character Set Index*/
pElement->nAlternateCharacterSetIndex = ImplGetI( pElement->nIndexPrecision );
break;
- case 0x15 : ComOut( CGM_LEVEL1, "Fill Bundle Index" )
+ case 0x15 : /*Fill Bundle Index*/
pElement->pFillBundle = (FillBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aFillList, pElement->aFillBundle );
break;
- case 0x16 : ComOut( CGM_LEVEL1, "Fill Interior Style" )
+ case 0x16 : /*Fill Interior Style*/
{
if ( pElement->nAspectSourceFlags & ASF_FILLINTERIORSTYLE )
pElement->pFillBundle->eFillInteriorStyle = (FillInteriorStyle)ImplGetUI16();
@@ -232,7 +232,7 @@ void CGM::ImplDoClass5()
pElement->aFillBundle.eFillInteriorStyle = (FillInteriorStyle)ImplGetUI16();
}
break;
- case 0x17 : ComOut( CGM_LEVEL1, "Fill Color" )
+ case 0x17 : /*Fill Color*/
{
if ( pElement->nAspectSourceFlags & ASF_FILLCOLOR )
pElement->pFillBundle->SetColor( ImplGetBitmapColor() );
@@ -240,7 +240,7 @@ void CGM::ImplDoClass5()
pElement->aFillBundle.SetColor( ImplGetBitmapColor() );
}
break;
- case 0x18 : ComOut( CGM_LEVEL1, "Fill Hatch Index" )
+ case 0x18 : /*Fill Hatch Index*/
{
if ( pElement->nAspectSourceFlags & ASF_HATCHINDEX )
pElement->pFillBundle->nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
@@ -248,7 +248,7 @@ void CGM::ImplDoClass5()
pElement->aFillBundle.nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x19 : ComOut( CGM_LEVEL1, "Fill Pattern Index" )
+ case 0x19 : /*Fill Pattern Index*/
{
if ( pElement->nAspectSourceFlags & ASF_PATTERNINDEX )
pElement->pFillBundle->nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
@@ -256,10 +256,10 @@ void CGM::ImplDoClass5()
pElement->aFillBundle.nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x1a : ComOut( CGM_LEVEL1, "Edge Bundle Index" )
+ case 0x1a : /*Edge Bundle Index*/
pElement->pEdgeBundle = (EdgeBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aEdgeList, pElement->aEdgeBundle );
break;
- case 0x1b : ComOut( CGM_LEVEL1, "Edge Type" )
+ case 0x1b : /*Edge Type*/
{
if ( pElement->nAspectSourceFlags & ASF_EDGETYPE )
pElement->pEdgeBundle->eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
@@ -267,7 +267,7 @@ void CGM::ImplDoClass5()
pElement->aEdgeBundle.eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
}
break;
- case 0x1c : ComOut( CGM_LEVEL1, "Edge Width" )
+ case 0x1c : /*Edge Width*/
{
double nWidth;
if ( pElement->eEdgeWidthSpecMode == SM_ABSOLUTE )
@@ -286,7 +286,7 @@ void CGM::ImplDoClass5()
: pElement->aEdgeBundle.nEdgeWidth = nWidth;
}
break;
- case 0x1d : ComOut( CGM_LEVEL1, "Edge Color" )
+ case 0x1d : /*Edge Color*/
{
if ( pElement->nAspectSourceFlags & ASF_EDGECOLOR )
pElement->pEdgeBundle->SetColor( ImplGetBitmapColor() );
@@ -294,7 +294,7 @@ void CGM::ImplDoClass5()
pElement->aEdgeBundle.SetColor( ImplGetBitmapColor() );
}
break;
- case 0x1e : ComOut( CGM_LEVEL1, "Edge Visibility" )
+ case 0x1e : /*Edge Visibility*/
{
switch( ImplGetUI16() )
{
@@ -304,12 +304,12 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x1f : ComOut( CGM_LEVEL1, "Fill Reference Point" )
+ case 0x1f : /*Fill Reference Point*/
ImplGetPoint( pElement->aFillRefPoint );
break;
- case 0x20 : ComOut( CGM_LEVEL1, "Pattern Table" ) break;
- case 0x21 : ComOut( CGM_LEVEL1, "Pattern Size" ) break;
- case 0x22 : ComOut( CGM_LEVEL1, "Color Table" )
+ case 0x20 : /*Pattern Table" )*/ break;
+ case 0x21 : /*Pattern Size" )*/ break;
+ case 0x22 : /*Color Table*/
{
sal_uInt32 nColorStartIndex = ImplGetUI( pElement->nColorIndexPrecision );
if ( ( nColorStartIndex > 255 ) ||
@@ -351,7 +351,7 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x23 : ComOut( CGM_LEVEL1, "Aspect Source Flags" )
+ case 0x23 : /*Aspect Source Flags*/
{
int nFlags = mnElementSize >> 2;
while ( nFlags-- > 0 )
@@ -390,8 +390,8 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x24 : ComOut( CGM_LEVEL2, "Pick Identifier" ) break;
- case 0x25 : ComOut( CGM_LEVEL3, "Line Cap" )
+ case 0x24 : /*Pick Identifier" ) bre*/
+ case 0x25 : /*Line Cap*/
{
switch( ImplGetUI16() )
{
@@ -404,7 +404,7 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x26 : ComOut( CGM_LEVEL3, "Line Join" )
+ case 0x26 : /*Line Join*/
{
switch( ImplGetUI16() )
{
@@ -415,38 +415,38 @@ void CGM::ImplDoClass5()
}
}
break;
- case 0x27 : ComOut( CGM_LEVEL3, "Line Type Continuation" ) break; // NS
- case 0x28 : ComOut( CGM_LEVEL3, "Line Type Initial Offset" ) break; // NS
- case 0x29 : ComOut( CGM_LEVEL3, "Text Score Type" ) break;
- case 0x2a : ComOut( CGM_LEVEL3, "Restricted Text Type" ) break;
- case 0x2b : ComOut( CGM_LEVEL3, "Interpolated interior" ) break;
- case 0x2c : ComOut( CGM_LEVEL3, "Edge Cap" ) break; // NS
- case 0x2d : ComOut( CGM_LEVEL3, "Edge Join" ) break;
- case 0x2e : ComOut( CGM_LEVEL3, "Edge Type Continuation" ) break; // NS
- case 0x2f : ComOut( CGM_LEVEL3, "Edge Type Initial Offset" ) break; // NS
- case 0x30 : ComOut( CGM_LEVEL3, "Symbol Library Index" ) break; // NS
- case 0x31 : ComOut( CGM_LEVEL3, "Symbol Color" ) break; // NS
- case 0x32 : ComOut( CGM_LEVEL3, "Symbol Size" ) break; // NS
- case 0x33 : ComOut( CGM_LEVEL3, "Symbol Orientation" ) break; // NS
- case 0x50 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Margins" ) break;
- case 0x51 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Expansion" ) break;
- case 0x52 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Anchor" ) break;
- case 0x53 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Horizontal Alignment" ) break;
- case 0x54 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Vertical Alignment" ) break;
- case 0x55 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Line Flow" ) break;
- case 0x60 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Spacing" ) break;
- case 0x61 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Indent" ) break;
- case 0x62 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Tabs" ) break;
- case 0x63 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Bullets" ) break;
- case 0x64 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Bullet Level" ) break;
- case 0x65 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Line Horizontal Alignment" ) break;
- case 0x66 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Line Vertical Alignment" ) break;
- case 0x67 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragragh Line Spacing" ) break;
- case 0x68 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Word Wrap" ) break;
- case 0x70 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Forward Advance Distance" ) break;
- case 0x71 : ComOut( CGM_UNKNOWN_LEVEL, "Word Spacing" ) break;
- case 0x72 : ComOut( CGM_UNKNOWN_LEVEL, "External Leading" ) break;
- case 0x7a : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Offset" )
+ case 0x27 : /*Line Type Continuation*/ break; // NS
+ case 0x28 : /*Line Type Initial Offset*/ break; // NS
+ case 0x29 : /*Text Score Type*/ break;
+ case 0x2a : /*Restricted Text Type*/ break;
+ case 0x2b : /*Interpolated interior*/ break;
+ case 0x2c : /*Edge Cap*/ break; // NS
+ case 0x2d : /*Edge Join*/ break;
+ case 0x2e : /*Edge Type Continuation*/ break; // NS
+ case 0x2f : /*Edge Type Initial Offset*/ break; // NS
+ case 0x30 : /*Symbol Library Index*/ break; // NS
+ case 0x31 : /*Symbol Color*/ break; // NS
+ case 0x32 : /*Symbol Size*/ break; // NS
+ case 0x33 : /*Symbol Orientation*/ break; // NS
+ case 0x50 : /*Block Text Region Margins*/ break;
+ case 0x51 : /*Block Text Region Expansion*/ break;
+ case 0x52 : /*Block Text Region Anchor*/ break;
+ case 0x53 : /*Block Text Paragraph Horizontal Alignment*/ break;
+ case 0x54 : /*Block Text Paragraph Vertical Alignment*/ break;
+ case 0x55 : /*Block Text Line Flow*/ break;
+ case 0x60 : /*Block Text Paragraph Spacing*/ break;
+ case 0x61 : /*Block Text Paragraph Indent*/ break;
+ case 0x62 : /*Block Text Paragraph Tabs*/ break;
+ case 0x63 : /*Block Text Paragraph Bullets*/ break;
+ case 0x64 : /*Block Text Paragraph Bullet Level*/ break;
+ case 0x65 : /*Block Text Paragraph Line Horizontal Alignment*/ break;
+ case 0x66 : /*Block Text Paragraph Line Vertical Alignment*/ break;
+ case 0x67 : /*Block Text Paragragh Line Spacing*/ break;
+ case 0x68 : /*Block Text Paragraph Word Wrap*/ break;
+ case 0x70 : /*Block Text Forward Advance Distance*/ break;
+ case 0x71 : /*Word Spacing*/ break;
+ case 0x72 : /*External Leading*/ break;
+ case 0x7a : /*set Gradient Offset*/
{
long nHorzOffset = ImplGetI( pElement->nIndexPrecision );
long nVertOffset = ImplGetI( pElement->nIndexPrecision );
@@ -455,18 +455,18 @@ void CGM::ImplDoClass5()
mnAct4PostReset |= ACT4_GRADIENT_ACTION;
}
break;
- case 0x7b : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Edge" )
+ case 0x7b : /*set Gradient Edge*/
{
mnAct4PostReset |= ACT4_GRADIENT_ACTION;
}
break;
- case 0x7c : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Angle" )
+ case 0x7c : /*set Gradient Angle*/
{
mpOutAct->SetGradientAngle( ImplGetI( pElement->nIndexPrecision ) );
mnAct4PostReset |= ACT4_GRADIENT_ACTION;
}
break;
- case 0x7d : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Description" )
+ case 0x7d : /*set Gradient Description*/
{
ImplGetI( pElement->nIndexPrecision ); // -Wall is this needed?
sal_uInt32 nNumberOfStages = ImplGetI( pElement->nIndexPrecision );
@@ -498,7 +498,7 @@ void CGM::ImplDoClass5()
mnAct4PostReset |= ACT4_GRADIENT_ACTION;
}
break;
- case 0x7e : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Style" )
+ case 0x7e : /*set Gradient Style*/
{
sal_uInt32 nStyle = ImplGetUI16( 8 );
double fRatio = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
@@ -506,19 +506,19 @@ void CGM::ImplDoClass5()
mnAct4PostReset |= ACT4_GRADIENT_ACTION;
}
break;
- case 0xff : ComOut( CGM_GDSF_ONLY, "inquire Font metrics" ) break;
- case 0xfe : ComOut( CGM_GDSF_ONLY, "inquire character widths" ) break;
- case 0xfd : ComOut( CGM_GDSF_ONLY, "set Text Font" ) break;
- case 0xfc : ComOut( CGM_GDSF_ONLY, "set current position" ) break;
- case 0xfb : ComOut( CGM_GDSF_ONLY, "set current position mode" ) break;
- case 0xfa : ComOut( CGM_GDSF_ONLY, "set character height mode" ) break;
- case 0xf9 : ComOut( CGM_GDSF_ONLY, "set Transform matrix 2D" ) break;
- case 0xf8 : ComOut( CGM_GDSF_ONLY, "set Transform matrix 3D" ) break;
- case 0xf7 : ComOut( CGM_GDSF_ONLY, "pop transformation state" ) break;
- case 0xf6 : ComOut( CGM_GDSF_ONLY, "clear transformation state" ) break;
- case 0xf5 : ComOut( CGM_GDSF_ONLY, "set character widths" ) break;
- case 0xf4 : ComOut( CGM_GDSF_ONLY, "set color name - for Pantone support" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0xff : /*inquire Font metrics*/ break;
+ case 0xfe : /*inquire character widths*/ break;
+ case 0xfd : /*set Text Font*/ break;
+ case 0xfc : /*set current position*/ break;
+ case 0xfb : /*set current position mode*/ break;
+ case 0xfa : /*set character height mode*/ break;
+ case 0xf9 : /*set Transform matrix 2D*/ break;
+ case 0xf8 : /*set Transform matrix 3D*/ break;
+ case 0xf7 : /*pop transformation state*/ break;
+ case 0xf6 : /*clear transformation state*/ break;
+ case 0xf5 : /*set character widths*/ break;
+ case 0xf4 : /*set color name - for Pantone support*/ break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx
index cd0605a..40ad3ca 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -39,7 +39,7 @@ void CGM::ImplDoClass7()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "Message" ) break;
+ case 0x01 : /*Message */break;
case 0x02 :
{
sal_uInt8* pAppData = mpSource + 12;
@@ -50,35 +50,35 @@ void CGM::ImplDoClass7()
{
switch ( nOpcode )
{
- case 0x000 : ComOut( CGM_LEVEL1, "AppData - Beginning of File Opcodes" )
+ case 0x000 : /*AppData - Beginning of File Opcodes*/
{
if ( mpChart == NULL )
mpChart = new CGMChart( *this );
mpChart->mnCurrentFileType = pAppData[ 3 ];
}
break;
- case 0x001 : ComOut( CGM_LEVEL1, "AppData - End of File Opcodes" ) break;
- case 0x190 : ComOut( CGM_LEVEL1, "AppData - FDESC" ) break;
- case 0x192 : ComOut( CGM_LEVEL1, "AppData - FNOTES" ) break;
- case 0x1F4 : ComOut( CGM_LEVEL1, "AppData - BOGENFILE" ) break;
- case 0x1F5 : ComOut( CGM_LEVEL1, "AppData - EOGENFILE" ) break;
- case 0x1F8 : ComOut( CGM_LEVEL1, "AppData - BOCHTGROUP" ) break;
- case 0x1F9 : ComOut( CGM_LEVEL1, "AppData - EOCHTGROUP" ) break;
- case 0x1FC : ComOut( CGM_LEVEL1, "AppData - BOCHTDATA" ) break;
- case 0x1FD : ComOut( CGM_LEVEL1, "AppData - EOCHTDATA" )
+ case 0x001 : /*AppData - End of File Opcodes */break;
+ case 0x190 : /*AppData - FDESC */break;
+ case 0x192 : /*AppData - FNOTES */break;
+ case 0x1F4 : /*AppData - BOGENFILE */break;
+ case 0x1F5 : /*AppData - EOGENFILE */break;
+ case 0x1F8 : /*AppData - BOCHTGROUP */break;
+ case 0x1F9 : /*AppData - EOCHTGROUP */break;
+ case 0x1FC : /*AppData - BOCHTDATA */break;
+ case 0x1FD : /*AppData - EOCHTDATA*/
{
mpOutAct->DrawChart();
}
break;
- case 0x200 : ComOut( CGM_LEVEL1, "AppData - BOSYMGROUP" ) break;
- case 0x201 : ComOut( CGM_LEVEL1, "AppData - EOSYMGROUP" ) break;
- case 0x204 : ComOut( CGM_LEVEL1, "AppData - BEGSYMBOL" ) break;
- case 0x205 : ComOut( CGM_LEVEL1, "AppData - ENDSYMBOL" ) break;
- case 0x208 : ComOut( CGM_LEVEL1, "AppData - BOSHWGROUP" ) break;
- case 0x209 : ComOut( CGM_LEVEL1, "AppData - EOSHWGROUP" ) break;
- case 0x260 : ComOut( CGM_LEVEL1, "AppData - BEGGROUP" ) break;
- case 0x262 : ComOut( CGM_LEVEL1, "AppData - ENDGROUP" ) break;
- case 0x264 : ComOut( CGM_LEVEL1, "AppData - DATANODE" )
+ case 0x200 : /*AppData - BOSYMGROUP */break;
+ case 0x201 : /*AppData - EOSYMGROUP */break;
+ case 0x204 : /*AppData - BEGSYMBOL */break;
+ case 0x205 : /*AppData - ENDSYMBOL */break;
+ case 0x208 : /*AppData - BOSHWGROUP */break;
+ case 0x209 : /*AppData - EOSHWGROUP */break;
+ case 0x260 : /*AppData - BEGGROUP */break;
+ case 0x262 : /*AppData - ENDGROUP */break;
+ case 0x264 : /*AppData - DATANODE*/
{
mpChart->mDataNode[ 0 ] = *(DataNode*)( pAppData );
sal_Int8 nZoneEnum = mpChart->mDataNode[ 0 ].nZoneEnum;
@@ -86,7 +86,7 @@ void CGM::ImplDoClass7()
mpChart->mDataNode[ nZoneEnum ] = *(DataNode*)( pAppData );
}
break;
- case 0x2BE : ComOut( CGM_LEVEL1, "AppData - SHWSLIDEREC" )
+ case 0x2BE : /*AppData - SHWSLIDEREC*/
{
if ( mnMode & CGM_EXPORT_IMPRESS )
{
@@ -109,12 +109,12 @@ void CGM::ImplDoClass7()
}
}
break;
- case 0x2C0 : ComOut( CGM_LEVEL1, "AppData - SHWKEYTABLE" ) break;
- case 0x2C2 : ComOut( CGM_LEVEL1, "AppData - SHWBUTTONTAB" ) break;
- case 0x2C4 : ComOut( CGM_LEVEL1, "AppData - SHWGLOBAL" ) break;
- case 0x2C6 : ComOut( CGM_LEVEL1, "AppData - SHWTITLE" ) break;
- case 0x2CA : ComOut( CGM_LEVEL1, "AppData - SHWAPP" ) break;
- case 0x320 : ComOut( CGM_LEVEL1, "AppData - TEXT" )
+ case 0x2C0 : /*AppData - SHWKEYTABLE */break;
+ case 0x2C2 : /*AppData - SHWBUTTONTAB */break;
+ case 0x2C4 : /*AppData - SHWGLOBAL */break;
+ case 0x2C6 : /*AppData - SHWTITLE */break;
+ case 0x2CA : /*AppData - SHWAPP */break;
+ case 0x320 : /*AppData - TEXT*/
{
TextEntry* pTextEntry = new TextEntry;
pTextEntry->nTypeOfText = *((sal_uInt16*)( pAppData ) );
@@ -150,89 +150,89 @@ void CGM::ImplDoClass7()
mpChart->InsertTextEntry( pTextEntry );
}
break;
- case 0x321 : ComOut( CGM_LEVEL1, "AppData - IOC_TABS" ) break;
- case 0x322 : ComOut( CGM_LEVEL1, "AppData - CHARTZONE" )
+ case 0x321 : /*AppData - IOC_TABS */break;
+ case 0x322 : /*AppData - CHARTZONE*/
{
mpChart->mChartZone = *( ChartZone* )( pAppData );
}
break;
- case 0x324 : ComOut( CGM_LEVEL1, "AppData - TITLEZONE" ) break;
- case 0x328 : ComOut( CGM_LEVEL1, "AppData - FOOTNOTEZONE" ) break;
- case 0x32A : ComOut( CGM_LEVEL1, "AppData - LEGENDZONE" ) break;
- case 0x330 : ComOut( CGM_LEVEL1, "AppData - PAGEORIENTDIM" )
+ case 0x324 : /*AppData - TITLEZONE */break;
+ case 0x328 : /*AppData - FOOTNOTEZONE */break;
+ case 0x32A : /*AppData - LEGENDZONE */break;
+ case 0x330 : /*AppData - PAGEORIENTDIM*/
{
mpChart->mPageOrientDim = *( PageOrientDim*)( pAppData );
}
break;
- case 0x334 : ComOut( CGM_LEVEL1, "AppData - CHTZONEOPTN" )
+ case 0x334 : /*AppData - CHTZONEOPTN*/
{
mpChart->mZoneOption = *( ZoneOption*)( pAppData );
}
break;
- case 0x336 : ComOut( CGM_LEVEL1, "AppData - CHTINTL" )
+ case 0x336 : /*AppData - CHTINTL*/
{
mpChart->mIntSettings = *( IntSettings*)( pAppData );
}
break;
- case 0x338 : ComOut( CGM_LEVEL1, "AppData - CHTLINESPC" ) break;
- case 0x384 : ComOut( CGM_LEVEL1, "AppData - ORGGRIDSTATE" ) break;
- case 0x386 : ComOut( CGM_LEVEL1, "AppData - ORGSCRSTATE" ) break;
- case 0x388 : ComOut( CGM_LEVEL1, "AppData - ORGTREESTATE" ) break;
- case 0x38A : ComOut( CGM_LEVEL1, "AppData - ORGTEXTOPTN" ) break;
- case 0x38E : ComOut( CGM_LEVEL1, "AppData - ORGBOXOPTN" ) break;
- case 0x390 : ComOut( CGM_LEVEL1, "AppData - ORGBOXDIM" ) break;
- case 0x392 : ComOut( CGM_LEVEL1, "AppData - ORGBOX" ) break;
- case 0x3EA : ComOut( CGM_LEVEL1, "AppData - TTLTEXTOPTN" ) break;
- case 0x3EE : ComOut( CGM_LEVEL1, "AppData - TTLAUTOBUILD" ) break;
- case 0x44E : ComOut( CGM_LEVEL1, "AppData - BULTEXTOPTN" ) break;
- case 0x452 : ComOut( CGM_LEVEL1, "AppData - BULLETOPTN" )
+ case 0x338 : /*AppData - CHTLINESPC */break;
+ case 0x384 : /*AppData - ORGGRIDSTATE */break;
+ case 0x386 : /*AppData - ORGSCRSTATE */break;
+ case 0x388 : /*AppData - ORGTREESTATE */break;
+ case 0x38A : /*AppData - ORGTEXTOPTN */break;
+ case 0x38E : /*AppData - ORGBOXOPTN */break;
+ case 0x390 : /*AppData - ORGBOXDIM */break;
+ case 0x392 : /*AppData - ORGBOX */break;
+ case 0x3EA : /*AppData - TTLTEXTOPTN */break;
+ case 0x3EE : /*AppData - TTLAUTOBUILD */break;
+ case 0x44E : /*AppData - BULTEXTOPTN */break;
+ case 0x452 : /*AppData - BULLETOPTN*/
{
mpChart->mBulletOption = *( BulletOption*)( pAppData );
}
break;
- case 0x454 : ComOut( CGM_LEVEL1, "AppData - BULLETLINES" )
+ case 0x454 : /*AppData - BULLETLINES*/
{
mpChart->mBulletLines = *( BulletLines*)( pAppData );
}
break;
- case 0x456 : ComOut( CGM_LEVEL1, "AppData - BULAUTOBUILD" ) break;
- case 0x4B2 : ComOut( CGM_LEVEL1, "AppData - TBLTEXTOPTN" ) break;
- case 0x4B6 : ComOut( CGM_LEVEL1, "AppData - TBLOPTN" ) break;
- case 0x4B8 : ComOut( CGM_LEVEL1, "AppData - TBLCOLOPTN" ) break;
- case 0x4BA : ComOut( CGM_LEVEL1, "AppData - TBLLEGENDOPTN" ) break;
- case 0x4BC : ComOut( CGM_LEVEL1, "AppData - TBLRANGEOPTN" ) break;
- case 0x4BE : ComOut( CGM_LEVEL1, "AppData - TBLROWOPTN" ) break;
- case 0x4C0 : ComOut( CGM_LEVEL1, "AppData - TBLAUTOBUILD" ) break;
- case 0x518 : ComOut( CGM_LEVEL1, "AppData - PIECHARTOPTN" ) break;
- case 0x51A : ComOut( CGM_LEVEL1, "AppData - PIELEGENDOPTN" ) break;
- case 0x51C : ComOut( CGM_LEVEL1, "AppData - PIETEXTOPTN" ) break;
- case 0x51E : ComOut( CGM_LEVEL1, "AppData - PIEOPTN" ) break;
- case 0x520 : ComOut( CGM_LEVEL1, "AppData - PIEPCTLABOPTN" ) break;
- case 0x522 : ComOut( CGM_LEVEL1, "AppData - PIEVALLABOPTN" ) break;
- case 0x524 : ComOut( CGM_LEVEL1, "AppData - PIESLICE" ) break;
- case 0x57A : ComOut( CGM_LEVEL1, "AppData - XYAXISOPTN" ) break;
- case 0x57C : ComOut( CGM_LEVEL1, "AppData - XYGRIDOPTN" ) break;
- case 0x57D : ComOut( CGM_LEVEL1, "AppData - XYGRIDSHOWFILL" ) break;
- case 0x57E : ComOut( CGM_LEVEL1, "AppData - XYSERIESOPTN" ) break;
- case 0x580 : ComOut( CGM_LEVEL1, "AppData - XYSTYLEOPTN" ) break;
- case 0x582 : ComOut( CGM_LEVEL1, "AppData - XYTABLEOPTN" ) break;
- case 0x584 : ComOut( CGM_LEVEL1, "AppData - XYTEXTOPTN" ) break;
- case 0x586 : ComOut( CGM_LEVEL1, "AppData - XYDATAOPTN" ) break;
- case 0x58A : ComOut( CGM_LEVEL1, "AppData - XYLEGENDOPN" ) break;
- case 0x58C : ComOut( CGM_LEVEL1, "AppData - XYCALCULATION" ) break;
- case 0x58E : ComOut( CGM_LEVEL1, "AppData - XYXVALUE" ) break;
- case 0x590 : ComOut( CGM_LEVEL1, "AppData - XYYVALUE" ) break;
- case 0x592 : ComOut( CGM_LEVEL1, "AppData - XYXEXTVALUE" ) break;
- case 0x618 : ComOut( CGM_LEVEL1, "AppData - IOC_CHTCOLRTAB" ) break;
- case 0x619 : ComOut( CGM_LEVEL1, "AppData - IOC_CHTFONTTAB" ) break;
- case 0x1fff : ComOut( CGM_LEVEL1, "AppData - 0x1fff" ) break;
- default : ComOut( CGM_LEVEL1, "UNKNOWN Application Data" ) break;
+ case 0x456 : /*AppData - BULAUTOBUILD */break;
+ case 0x4B2 : /*AppData - TBLTEXTOPTN */break;
+ case 0x4B6 : /*AppData - TBLOPTN */break;
+ case 0x4B8 : /*AppData - TBLCOLOPTN */break;
+ case 0x4BA : /*AppData - TBLLEGENDOPTN */break;
+ case 0x4BC : /*AppData - TBLRANGEOPTN */break;
+ case 0x4BE : /*AppData - TBLROWOPTN */break;
+ case 0x4C0 : /*AppData - TBLAUTOBUILD */break;
+ case 0x518 : /*AppData - PIECHARTOPTN */break;
+ case 0x51A : /*AppData - PIELEGENDOPTN */break;
+ case 0x51C : /*AppData - PIETEXTOPTN */break;
+ case 0x51E : /*AppData - PIEOPTN */break;
+ case 0x520 : /*AppData - PIEPCTLABOPTN */break;
+ case 0x522 : /*AppData - PIEVALLABOPTN */break;
+ case 0x524 : /*AppData - PIESLICE */break;
+ case 0x57A : /*AppData - XYAXISOPTN */break;
+ case 0x57C : /*AppData - XYGRIDOPTN */break;
+ case 0x57D : /*AppData - XYGRIDSHOWFILL */break;
+ case 0x57E : /*AppData - XYSERIESOPTN */break;
+ case 0x580 : /*AppData - XYSTYLEOPTN */break;
+ case 0x582 : /*AppData - XYTABLEOPTN */break;
+ case 0x584 : /*AppData - XYTEXTOPTN */break;
+ case 0x586 : /*AppData - XYDATAOPTN */break;
+ case 0x58A : /*AppData - XYLEGENDOPN */break;
+ case 0x58C : /*AppData - XYCALCULATION */break;
+ case 0x58E : /*AppData - XYXVALUE */break;
+ case 0x590 : /*AppData - XYYVALUE */break;
+ case 0x592 : /*AppData - XYXEXTVALUE */break;
+ case 0x618 : /*AppData - IOC_CHTCOLRTAB */break;
+ case 0x619 : /*AppData - IOC_CHTFONTTAB */break;
+ case 0x1fff : /*AppData - 0x1fff */break;
+ default : /*UNKNOWN Application Data */break;
}
}
mnParaSize = mnElementSize;
break;
}
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx
index 79dbd44..f414a2a 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -53,158 +53,158 @@ void CGM::ImplDoClass6()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL1, "Escape" )
+ case 0x01 : /*Escape*/
{
long nIdentifier = ImplGetI( pElement->nIntegerPrecision );
switch ( nIdentifier )
{
- case 0 : ComOut( CGM_DESCRIPTION, "inquire function support" ) break;
- case -1 : ComOut( CGM_DESCRIPTION, "set underline mode" )
+ case 0 : /*inquire function support */break;
+ case -1 : /*set underline mode*/
{
ImplSetUnderlineMode()
}
break;
- case -2 : ComOut( CGM_DESCRIPTION, "set script mode" ) break;
- case -3 : ComOut( CGM_DESCRIPTION, "set shadow mode" ) break;
- case -6 : ComOut( CGM_DESCRIPTION, "inquire origin offset" ) break;
- case -8 : ComOut( CGM_DESCRIPTION, "set media size" ) break;
- case -10 : ComOut( CGM_DESCRIPTION, "set character mode" ) break;
- case -14 : ComOut( CGM_DESCRIPTION, "resolution mode" ) break;
- case -17 : ComOut( CGM_DESCRIPTION, "line cap" ) break;
- case -18 : ComOut( CGM_DESCRIPTION, "line join" ) break;
- case -19 : ComOut( CGM_DESCRIPTION, "edge join" ) break;
- case -30 : ComOut( CGM_DESCRIPTION, "media type" ) break;
- case -31 : ComOut( CGM_DESCRIPTION, "number of copies" ) break;
- case -32 : ComOut( CGM_DESCRIPTION, "orientation" ) break;
- case -33 : ComOut( CGM_DESCRIPTION, "device color representation" ) break;
- case -34 : ComOut( CGM_DESCRIPTION, "device font list" ) break;
- case -35 : ComOut( CGM_DESCRIPTION, "color reversal mode" ) break;
- case -36 : ComOut( CGM_DESCRIPTION, "line cap attributes" ) break;
- case -37 : ComOut( CGM_DESCRIPTION, "begin effect" ) break;
- case -38 : ComOut( CGM_DESCRIPTION, "end effect" ) break;
- case -39 : ComOut( CGM_DESCRIPTION, "begin effect definition" ) break;
- case -40 : ComOut( CGM_DESCRIPTION, "end effect definition" ) break;
- case -41 : ComOut( CGM_DESCRIPTION, "end style definition" ) break;
- case -42 : ComOut( CGM_DESCRIPTION, "begin eps data" ) break;
- case -43 : ComOut( CGM_DESCRIPTION, "eps data" ) break;
- case -44 : ComOut( CGM_DESCRIPTION, "end eps data" ) break;
- case -45 : ComOut( CGM_DESCRIPTION, "set background style" ) break;
- case -46 : ComOut( CGM_DESCRIPTION, "set eps mode" ) break;
- case -47 : ComOut( CGM_DESCRIPTION, "fill mode" ) break;
- case -48 : ComOut( CGM_DESCRIPTION, "begin symbol" ) break;
- case -49 : ComOut( CGM_DESCRIPTION, "end symbol" ) break;
- case -50 : ComOut( CGM_DESCRIPTION, "begin layer" ) break;
- case -51 : ComOut( CGM_DESCRIPTION, "end layer" ) break;
- case -52 : ComOut( CGM_DESCRIPTION, "layer visibility" ) break;
- case -53 : ComOut( CGM_DESCRIPTION, "inquire foreign data" ) break;
- case -54 : ComOut( CGM_DESCRIPTION, "set text offset" ) break;
- case -55 : ComOut( CGM_DESCRIPTION, "begin group" ) break;
- case -56 : ComOut( CGM_DESCRIPTION, "end group" ) break;
- case -100 : ComOut( CGM_DESCRIPTION, "begin patch" ) break;
- case -101 : ComOut( CGM_DESCRIPTION, "end patch" ) break;
- case -102 : ComOut( CGM_DESCRIPTION, "begin block text region" ) break;
- case -103 : ComOut( CGM_DESCRIPTION, "end block text region" ) break;
- case -120 : ComOut( CGM_DESCRIPTION, "region margins" ) break;
- case -121 : ComOut( CGM_DESCRIPTION, "region expansions" ) break;
- case -122 : ComOut( CGM_DESCRIPTION, "region anchor" ) break;
- case -123 : ComOut( CGM_DESCRIPTION, "paragraph horizontal align" ) break;
- case -124 : ComOut( CGM_DESCRIPTION, "paragraph vertical align" ) break;
- case -125 : ComOut( CGM_DESCRIPTION, "region line flow" ) break;
- case -130 : ComOut( CGM_DESCRIPTION, "paragraph spacing" ) break;
- case -131 : ComOut( CGM_DESCRIPTION, "paragraph identation" ) break;
- case -132 : ComOut( CGM_DESCRIPTION, "paragraph tabs" ) break;
- case -133 : ComOut( CGM_DESCRIPTION, "paragraph bullet" ) break;
- case -134 : ComOut( CGM_DESCRIPTION, "paragraph bulet level" ) break;
- case -135 : ComOut( CGM_DESCRIPTION, "line horuzontal align" ) break;
- case -136 : ComOut( CGM_DESCRIPTION, "line vertical align" ) break;
- case -137 : ComOut( CGM_DESCRIPTION, "line spacing" ) break;
- case -138 : ComOut( CGM_DESCRIPTION, "word wrap" ) break;
- case -150 : ComOut( CGM_DESCRIPTION, "forward advance distance" ) break;
- case -151 : ComOut( CGM_DESCRIPTION, "word spacing" ) break;
- case -152 : ComOut( CGM_DESCRIPTION, "external leading" ) break;
- case -160 : ComOut( CGM_DESCRIPTION, "set gradient offset" ) break;
- case -161 : ComOut( CGM_DESCRIPTION, "set gradient edge" ) break;
- case -162 : ComOut( CGM_DESCRIPTION, "set gradient angle" ) break;
- case -163 : ComOut( CGM_DESCRIPTION, "set gradient description" ) break;
- case -164 : ComOut( CGM_DESCRIPTION, "set gradient style" ) break;
- case -165 : ComOut( CGM_DESCRIPTION, "set back ground style" ) break;
- case -170 : ComOut( CGM_DESCRIPTION, "geometric pattern draw style" ) break;
- case -190 : ComOut( CGM_DESCRIPTION, "set character width" ) break;
- case -191 : ComOut( CGM_DESCRIPTION, "hyperlink definitions" ) break;
- case -192 : ComOut( CGM_DESCRIPTION, "set color name for pantone" ) break;
- case -32746 : ComOut( CGM_DESCRIPTION, "set text font" ) break;
- case -32747 : ComOut( CGM_DESCRIPTION, "font selection mode" ) break;
- case -32752 : ComOut( CGM_DESCRIPTION, "connecting edge" ) break;
- case -32753 : ComOut( CGM_DESCRIPTION, "set drawing mode" ) break;
- case -32754 : ComOut( CGM_DESCRIPTION, "inquire clip rectangle" ) break;
- case -32755 : ComOut( CGM_DESCRIPTION, "protection region indicator" ) break;
- case -32756 : ComOut( CGM_DESCRIPTION, "end protection region" ) break;
- case -32757 : ComOut( CGM_DESCRIPTION, "begin protection region" ) break;
- case -32758 : ComOut( CGM_DESCRIPTION, "geometric pattern definition" ) break;
- case -32759 : ComOut( CGM_DESCRIPTION, "hatch style definition" ) break;
- case -32760 : ComOut( CGM_DESCRIPTION, "close figure" ) break;
- case -32761 : ComOut( CGM_DESCRIPTION, "end figure" )
+ case -2 : /*set script mode */break;
+ case -3 : /*set shadow mode */break;
+ case -6 : /*inquire origin offset */break;
+ case -8 : /*set media size */break;
+ case -10 : /*set character mode */break;
+ case -14 : /*resolution mode */break;
+ case -17 : /*line cap */break;
+ case -18 : /*line join */break;
+ case -19 : /*edge join */break;
+ case -30 : /*media type */break;
+ case -31 : /*number of copies */break;
+ case -32 : /*orientation */break;
+ case -33 : /*device color representation */break;
+ case -34 : /*device font list */break;
+ case -35 : /*color reversal mode */break;
+ case -36 : /*line cap attributes */break;
+ case -37 : /*begin effect */break;
+ case -38 : /*end effect */break;
+ case -39 : /*begin effect definition */break;
+ case -40 : /*end effect definition */break;
+ case -41 : /*end style definition */break;
+ case -42 : /*begin eps data */break;
+ case -43 : /*eps data */break;
+ case -44 : /*end eps data */break;
+ case -45 : /*set background style */break;
+ case -46 : /*set eps mode */break;
+ case -47 : /*fill mode */break;
+ case -48 : /*begin symbol */break;
+ case -49 : /*end symbol */break;
+ case -50 : /*begin layer */break;
+ case -51 : /*end layer */break;
+ case -52 : /*layer visibility */break;
+ case -53 : /*inquire foreign data */break;
+ case -54 : /*set text offset */break;
+ case -55 : /*begin group */break;
+ case -56 : /*end group */break;
+ case -100 : /*begin patch */break;
+ case -101 : /*end patch */break;
+ case -102 : /*begin block text region */break;
+ case -103 : /*end block text region */break;
+ case -120 : /*region margins */break;
+ case -121 : /*region expansions */break;
+ case -122 : /*region anchor */break;
+ case -123 : /*paragraph horizontal align */break;
+ case -124 : /*paragraph vertical align */break;
+ case -125 : /*region line flow */break;
+ case -130 : /*paragraph spacing */break;
+ case -131 : /*paragraph identation */break;
+ case -132 : /*paragraph tabs */break;
+ case -133 : /*paragraph bullet */break;
+ case -134 : /*paragraph bulet level */break;
+ case -135 : /*line horuzontal align */break;
+ case -136 : /*line vertical align */break;
+ case -137 : /*line spacing */break;
+ case -138 : /*word wrap */break;
+ case -150 : /*forward advance distance */break;
+ case -151 : /*word spacing */break;
+ case -152 : /*external leading */break;
+ case -160 : /*set gradient offset */break;
+ case -161 : /*set gradient edge */break;
+ case -162 : /*set gradient angle */break;
+ case -163 : /*set gradient description */break;
+ case -164 : /*set gradient style */break;
+ case -165 : /*set back ground style */break;
+ case -170 : /*geometric pattern draw style */break;
+ case -190 : /*set character width */break;
+ case -191 : /*hyperlink definitions */break;
+ case -192 : /*set color name for pantone */break;
+ case -32746 : /*set text font */break;
+ case -32747 : /*font selection mode */break;
+ case -32752 : /*connecting edge */break;
+ case -32753 : /*set drawing mode */break;
+ case -32754 : /*inquire clip rectangle */break;
+ case -32755 : /*protection region indicator */break;
+ case -32756 : /*end protection region */break;
+ case -32757 : /*begin protection region */break;
+ case -32758 : /*geometric pattern definition */break;
+ case -32759 : /*hatch style definition */break;
+ case -32760 : /*close figure */break;
+ case -32761 : /*end figure*/
{
mpOutAct->EndFigure();
mbFigure = sal_False;
}
break;
- case -32762 : ComOut( CGM_DESCRIPTION, "begin figure" )
+ case -32762 : /*begin figure*/
{
mbFigure = sal_True;
mpOutAct->BeginFigure();
}
break;
- case -32763 : ComOut( CGM_DESCRIPTION, "pop transformatin" ) break;
- case -32764 : ComOut( CGM_DESCRIPTION, "push transformation" ) break;
- case -32765 : ComOut( CGM_DESCRIPTION, "copy segment" ) break;
- case -32766 : ComOut( CGM_DESCRIPTION, "endseg" ) break;
- case -32767 : ComOut( CGM_DESCRIPTION, "begin segment" ) break;
- default : ComOut( CGM_DESCRIPTION, "????????????????????????????????" ) break;
+ case -32763 : /*pop transformatin */break;
+ case -32764 : /*push transformation */break;
+ case -32765 : /*copy segment */break;
+ case -32766 : /*endseg */break;
+ case -32767 : /*begin segment */break;
+ default : break;
}
mnParaSize = mnElementSize;
}
break;
- case 0x02 : ComOut( CGM_LEVEL1, "Get Escape" ) break;
- case 0x11 : ComOut( CGM_GDSF_ONLY, "Set Underline Mode" )
+ case 0x02 : /*Get Escape */break;
+ case 0x11 : /*Set Underline Mode*/
{
ImplSetUnderlineMode();
}
break;
- case 0x12 : ComOut( CGM_GDSF_ONLY, "Set Script Mode" ) break;
- case 0x13 : ComOut( CGM_GDSF_ONLY, "Set Shadow Mode" ) break;
- case 0x18 : ComOut( CGM_GDSF_ONLY, "Set Media Size" ) break;
- case 0x20 : ComOut( CGM_GDSF_ONLY, "Set Character Mode" ) break;
- case 0x24 : ComOut( CGM_GDSF_ONLY, "Resolution Mode" ) break;
- case 0x27 : ComOut( CGM_GDSF_ONLY, "Line Cap" ) break;
- case 0x28 : ComOut( CGM_GDSF_ONLY, "Line Join" ) break;
- case 0x29 : ComOut( CGM_GDSF_ONLY, "Edge Join" ) break;
- case 0x40 : ComOut( CGM_GDSF_ONLY, "Media Type" ) break;
- case 0x41 : ComOut( CGM_GDSF_ONLY, "Number of Copies" ) break;
- case 0x42 : ComOut( CGM_GDSF_ONLY, "Origin" ) break;
- case 0x45 : ComOut( CGM_GDSF_ONLY, "Color Reversal Mode" ) break;
- case 0x46 : ComOut( CGM_GDSF_ONLY, "Line Cap Attributes" ) break;
- case 0x49 : ComOut( CGM_GDSF_ONLY, "Begin Effect Definition" ) break;
- case 0x50 : ComOut( CGM_GDSF_ONLY, "End Effect Definition" ) break;
- case 0x51 : ComOut( CGM_GDSF_ONLY, "Line End Style Attributes" ) break;
- case 0x52 : ComOut( CGM_GDSF_ONLY, "Begin Data" ) break;
- case 0x53 : ComOut( CGM_GDSF_ONLY, "Data" ) break;
- case 0x54 : ComOut( CGM_GDSF_ONLY, "End Data" ) break;
- case 0x55 : ComOut( CGM_GDSF_ONLY, "Set Background Style" ) break;
- case 0x56 : ComOut( CGM_GDSF_ONLY, "Set EPS Mode" ) break;
- case 0x57 : ComOut( CGM_GDSF_ONLY, "Fill Mode" ) break;
- case 0x58 : ComOut( CGM_GDSF_ONLY, "Begin Symbol" ) break;
- case 0x59 : ComOut( CGM_GDSF_ONLY, "End Symbol" ) break;
- case 0x60 : ComOut( CGM_GDSF_ONLY, "Begin Layer" ) break;
- case 0x61 : ComOut( CGM_GDSF_ONLY, "End Layer" ) break;
- case 0x62 : ComOut( CGM_GDSF_ONLY, "Layer Visibility" ) break;
- case 0x64 : ComOut( CGM_GDSF_ONLY, "Set Text Offset" ) break;
- case 0xFF : ComOut( CGM_GDSF_ONLY, "Inquire Function Support" ) break;
- case 0xFE : ComOut( CGM_GDSF_ONLY, "Inquire Origin" ) break;
- case 0xFD : ComOut( CGM_GDSF_ONLY, "Inquire Foreign Data Mode" ) break;
- case 0xFC : ComOut( CGM_GDSF_ONLY, "Inquire Text Extent" ) break;
- case 0xFB : ComOut( CGM_GDSF_ONLY, "Inquire DPI" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0x12 : /*Set Script Mode */break;
+ case 0x13 : /*Set Shadow Mode */break;
+ case 0x18 : /*Set Media Size */break;
+ case 0x20 : /*Set Character Mode */break;
+ case 0x24 : /*Resolution Mode */break;
+ case 0x27 : /*Line Cap */break;
+ case 0x28 : /*Line Join */break;
+ case 0x29 : /*Edge Join */break;
+ case 0x40 : /*Media Type */break;
+ case 0x41 : /*Number of Copies */break;
+ case 0x42 : /*Origin */break;
+ case 0x45 : /*Color Reversal Mode */break;
+ case 0x46 : /*Line Cap Attributes */break;
+ case 0x49 : /*Begin Effect Definition */break;
+ case 0x50 : /*End Effect Definition */break;
+ case 0x51 : /*Line End Style Attributes */break;
+ case 0x52 : /*Begin Data */break;
+ case 0x53 : /*Data */break;
+ case 0x54 : /*End Data */break;
+ case 0x55 : /*Set Background Style */break;
+ case 0x56 : /*Set EPS Mode */break;
+ case 0x57 : /*Fill Mode */break;
+ case 0x58 : /*Begin Symbol */break;
+ case 0x59 : /*End Symbol */break;
+ case 0x60 : /*Begin Layer */break;
+ case 0x61 : /*End Layer */break;
+ case 0x62 : /*Layer Visibility */break;
+ case 0x64 : /*Set Text Offset */break;
+ case 0xFF : /*Inquire Function Support */break;
+ case 0xFE : /*Inquire Origin */break;
+ case 0xFD : /*Inquire Foreign Data Mode */break;
+ case 0xFC : /*Inquire Text Extent */break;
+ case 0xFB : /*Inquire DPI */break;
+ default: break;
}
};
@@ -214,16 +214,16 @@ void CGM::ImplDoClass8()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_LEVEL2, "Copy Segment" ) break; // NS
- case 0x02 : ComOut( CGM_LEVEL2, "Inheritance Filter" ) break; // NS
- case 0x03 : ComOut( CGM_LEVEL2, "Clip Inheritance" ) break; // NS
- case 0x04 : ComOut( CGM_LEVEL2, "Segment Transformation" ) break;
- case 0x05 : ComOut( CGM_LEVEL2, "Segment HighLighting" ) break; // NS
- case 0x06 : ComOut( CGM_LEVEL2, "Segment Display Priority" ) break; // NS
- case 0x07 : ComOut( CGM_LEVEL2, "Segment Pick Priority" ) break; // NS
- case 0xfe : ComOut( CGM_GDSF_ONLY, "INQ Current Position" ) break;
- case 0xff : ComOut( CGM_GDSF_ONLY, "INQ Inserted Object Extent" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break; // NS
+ case 0x01 : /*Copy Segment */break; // NS
+ case 0x02 : /*Inheritance Filter */break; // NS
+ case 0x03 : /*Clip Inheritance */break; // NS
+ case 0x04 : /*Segment Transformation */break;
+ case 0x05 : /*Segment HighLighting */break; // NS
+ case 0x06 : /*Segment Display Priority */break; // NS
+ case 0x07 : /*Segment Pick Priority */break; // NS
+ case 0xfe : /*INQ Current Position */break;
+ case 0xff : /*INQ Inserted Object Extent */break;
+ default: break; // NS
}
};
@@ -233,17 +233,17 @@ void CGM::ImplDoClass9()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_UNKNOWN_LEVEL, "Pixel Array" ) break; // NS
- case 0x02 : ComOut( CGM_UNKNOWN_LEVEL, "Create Bitmap" ) break; // NS
- case 0x03 : ComOut( CGM_UNKNOWN_LEVEL, "Delete Bitmap" ) break; // NS
- case 0x04 : ComOut( CGM_UNKNOWN_LEVEL, "Select Drawing Bitmap" ) break; // NS
- case 0x05 : ComOut( CGM_UNKNOWN_LEVEL, "Display Bitmap" ) break; // NS
- case 0x06 : ComOut( CGM_UNKNOWN_LEVEL, "Drawing Mode" ) break;
- case 0x07 : ComOut( CGM_UNKNOWN_LEVEL, "Mapped Bitmap ForeGrnd Color" ) break; // NS
- case 0x08 : ComOut( CGM_UNKNOWN_LEVEL, "Fill Bitmap" ) break; // NS
- case 0x09 : ComOut( CGM_UNKNOWN_LEVEL, "Two Operand BitBlt" ) break; // NS
- case 0x0a : ComOut( CGM_UNKNOWN_LEVEL, "Three Operand BitBlt" ) break; // NS
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0x01 : /*Pixel Array */break; // NS
+ case 0x02 : /*Create Bitmap */break; // NS
+ case 0x03 : /*Delete Bitmap */break; // NS
+ case 0x04 : /*Select Drawing Bitmap */break; // NS
+ case 0x05 : /*Display Bitmap */break; // NS
+ case 0x06 : /*Drawing Mode */break;
+ case 0x07 : /*Mapped Bitmap ForeGrnd Color */break; // NS
+ case 0x08 : /*Fill Bitmap */break; // NS
+ case 0x09 : /*Two Operand BitBlt */break; // NS
+ case 0x0a : /*Three Operand BitBlt */break; // NS
+ default: break;
}
};
@@ -253,10 +253,10 @@ void CGM::ImplDoClass15()
{
switch ( mnElementID )
{
- case 0x01 : ComOut( CGM_UNKNOWN_LEVEL, "Inquire Error Stack" ) break;
- case 0x02 : ComOut( CGM_UNKNOWN_LEVEL, "Pop Error Stack" ) break;
- case 0x03 : ComOut( CGM_UNKNOWN_LEVEL, "Empty Error Stack" ) break;
- default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
+ case 0x01 : /*Inquire Error Stack */break;
+ case 0x02 : /*Pop Error Stack */break;
+ case 0x03 : /*Empty Error Stack */break;
+ default: break;
}
};
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
index 141c33b..00f8f27 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -45,7 +45,6 @@
// LEVEL 1 BUT ARE NOT DEFINED IN ISO 7942(GKS)
#define CGM_DRAWING_PLUS_CONTROL_SET 0x0200 // INDICATES THAT THIS IS AN ADDITIONAL LEVEL 1
// ELEMENT
-#define ComOut( Level, Description ) if ( mpCommentOut ) ImplComment( Level, Description );
#define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col )
#define ALIGN2( _nElementSize ) { _nElementSize = ( _nElementSize + 1 ) & ~1; }
commit 077e9731d73752c10a0e020ff5b1e925fc53970c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 08:57:48 2011 +0100
rename SetKey to SetCryptMaskKey
diff --git a/filter/source/msfilter/powerpoint/ppttoxml.cxx b/filter/source/msfilter/powerpoint/ppttoxml.cxx
index 86cb1f9..4259424 100644
--- a/filter/source/msfilter/powerpoint/ppttoxml.cxx
+++ b/filter/source/msfilter/powerpoint/ppttoxml.cxx
@@ -63,7 +63,7 @@ sal_Bool PptToXml::filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor,
if( xDocStream.Is() )
{
xDocStream->SetVersion( xStg->GetVersion() );
- xDocStream->SetKey( xStg->GetKey() );
+ xDocStream->SetCryptMaskKey(xStg->GetKey());
xHdl->startDocument();
commit 13cb9de865b8590a900412e87d0ebba13d9d4dd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 01:02:14 2011 +0100
rename SetKey to informative SetCryptMaskKey
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 5481ed3..9edf218 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -1244,14 +1244,14 @@ BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const
// Aber das hier will ich jetzt speichern:
pLib->ResetFlag( SBX_DONTSTORE );
if ( pLibInfo->HasPassword() )
- xBasicStream->SetKey( szCryptingKey );
+ xBasicStream->SetCryptMaskKey(szCryptingKey);
BOOL bDone = pLib->Store( *xBasicStream );
xBasicStream->SetBufferSize( 0 );
if ( bDone )
{
// Diese Informationen immer verschluesseln...
xBasicStream->SetBufferSize( 1024 );
- xBasicStream->SetKey( szCryptingKey );
+ xBasicStream->SetCryptMaskKey(szCryptingKey);
*xBasicStream << static_cast<sal_uInt32>(PASSWORD_MARKER);
String aTmpPassword = pLibInfo->GetPassword();
xBasicStream->WriteByteString( aTmpPassword, RTL_TEXTENCODING_MS_1252 );
@@ -1262,7 +1262,7 @@ BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const
pLib->SetModified( FALSE );
if( !xBasicStorage->Commit() )
bDone = FALSE;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list