diff options
28 files changed, 19 insertions, 233 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 8069243ad234..87427b2a5a91 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -682,7 +682,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) uno::Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments( aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) ); - // /-- locked controllers + // -- locked controllers ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); // create and attach new data source diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 1f49652ae2fd..b93dfc547743 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -838,10 +838,8 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x if( !xNewData.is() ) return; - // /-- locked controllers ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY )); m_xChartData.set( new ChartDataWrapper( m_spChart2ModelContact, xNewData ) ); - // \-- locked controllers } // ____ XModel ____ diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index 6611cbf6100a..c6f7ee48da25 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -190,7 +190,7 @@ namespace chart ENSURE_OR_RETURN_VOID( i_modelToCopyFrom.is(), "ChartModelElement::applyModelContentToModel: invalid source model!" ); try { - // /-- loccked controllers of destination + // locked controllers of destination ControllerLockGuardUNO aLockedControllers( i_model ); Reference< XChartDocument > xSource( i_modelToCopyFrom, UNO_QUERY_THROW ); Reference< XChartDocument > xDestination( i_model, UNO_QUERY_THROW ); diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 9793dcce9ec9..4dbdd26255f0 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -385,7 +385,6 @@ OUString SelectionHelper::getHitObjectCID( DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall ) { - // //- solar mutex SolarMutexGuard aSolarGuard; OUString aRet; diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 939741c4f210..1fda7e31f384 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -90,7 +90,7 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) #define LCL_PROP_CPPUTYPE(t) (cppu::UnoType<t>::get()) -// // ____ XTypeProvider ____ +// ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() throw (uno::RuntimeException, std::exception) diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 2ba5c62aa5af..79b41a1d2b74 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -565,13 +565,6 @@ Assembly ^ TypeEmitter::type_resolve( ::System::Type ^ ret_type = get_type( cts_name, false /* no exc */ ); if (nullptr == ret_type) { -// Emit::EnumBuilder * enum_builder = -// m_module_builder->DefineEnum( -// cts_name, -// (TypeAttributes) (TypeAttributes::Public | -// // TypeAttributes::Sealed | -// TypeAttributes::AnsiClass), -// __typeof (::System::Int32) ); // workaround enum builder bug Emit::TypeBuilder ^ enum_builder = m_module_builder->DefineType( diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index ae99c811b263..bfdfd24f1e8f 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -169,120 +169,6 @@ void KeyColumns::refresh() } -// void alterColumnByDescriptor( -// const OUString & schemaName, -// const OUString & tableName, -// rtl_TextEncoding encoding, -// const Reference< XStatement > &stmt, -// const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & past, -// const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & future) -// { -// Statics & st = getStatics(); - -// // if( past->getPropertyValue( st.TABLE_NAME ) != future->getPropertyValue( st.TABLE_NAME ) || -// // past->getPropertyValue( st.SCHEMA_NAME ) != future->getPropertyValue( st.SCHEMA_NAME )) -// // { -// // OUStringBuffer buf(128); -// // buf.append( "Can't move column " ); -// // buf.append( extractStringProperty( past, st.COLUMN_NAME ) ); -// // buf.append( " from table " ); -// // buf.append( extractStringProperty( past, st.TABLE_NAME ) ); -// // buf.append( " to table " ); -// // buf.append( extractStringProperty( past, st.TABLE_NAME ) ); -// // throw SQLException( buf.makeStringAndClear() ); -// // } - -// // OUString tableName = extractStringProperty( past, st.TABLE_NAME ); -// // OUString schemaName = extractStringProperty( past, st.SCHEMA_NAME ); -// OUString pastColumnName = extractStringProperty( past, st.NAME ); -// OUString futureColumnName = extractStringProperty( future, st.NAME ); -// OUString pastTypeName = sqltype2string( past ); -// OUString futureTypeName = sqltype2string( future ); - -// TransactionGuard transaction( stmt ); - -// OUStringBuffer buf( 128 ); -// if( ! pastColumnName.getLength()) -// { -// // create a new column -// buf.append( "ALTER TABLE" ); -// bufferQuoteQualifiedIdentifier( buf, schemaName, tableName ); -// buf.append( "ADD COLUMN" ); -// bufferQuoteIdentifier( buf, futureColumnName ); -// buf.append( futureTypeName ); -// transaction.executeUpdate( buf.makeStringAndClear() ); -// } -// else -// { -// if( pastTypeName != futureTypeName ) -// { -// throw RuntimeException( -// "Can't modify column types, drop the column and create a new one" ); -// } - -// if( pastColumnName != futureColumnName ) -// { -// buf.append( "ALTER TABLE" ); -// bufferQuoteQualifiedIdentifier( buf, schemaName, tableName ); -// buf.append( "RENAME COLUMN" ); -// bufferQuoteIdentifier( buf, pastColumnName ); -// buf.append( "TO" ); -// bufferQuoteIdentifier( buf, futureColumnName ); -// transaction.executeUpdate( buf.makeStringAndClear() ); -// } -// } - -// OUString futureDefaultValue = extractStringProperty( future, st.DEFAULT_VALUE ); -// OUString pastDefaultValue = extractStringProperty( past, st.DEFAULT_VALUE ); -// if( futureDefaultValue != pastDefaultValue ) -// { -// buf = OUStringBuffer( 128 ); -// buf.append( "ALTER TABLE" ); -// bufferQuoteQualifiedIdentifier( buf, schemaName, tableName ); -// buf.append( "ALTER COLUMN" ); -// bufferQuoteIdentifier( buf, futureColumnName ); -// buf.append( "SET DEFAULT " ); -// // default value is not quoted, caller needs to quote himself (otherwise -// // how to pass e.g. nextval('something' ) ???? -// buf.append( futureDefaultValue ); -// // bufferQuoteConstant( buf, defaultValue, encoding ); -// transaction.executeUpdate( buf.makeStringAndClear() ); -// } - -// sal_Int32 futureNullable = extractIntProperty( future, st.IS_NULLABLE ); -// sal_Int32 pastNullable = extractIntProperty( past, st.IS_NULLABLE ); -// if( futureNullable != pastNullable ) -// { -// buf = OUStringBuffer( 128 ); -// buf.append( "ALTER TABLE" ); -// bufferQuoteQualifiedIdentifier( buf, schemaName, tableName ); -// buf.append( "ALTER COLUMN" ); -// bufferQuoteIdentifier( buf, futureColumnName ); -// if( futureNullable == com::sun::star::sdbc::ColumnValue::NO_NULLS ) -// { -// buf.append( "SET" ); -// } -// else -// { -// buf.append( "DROP" ); -// } -// buf.append( " NOT NULL" ); -// transaction.executeUpdate( buf.makeStringAndClear() ); -// } - -// OUString futureComment = extractStringProperty( future, st.DESCRIPTION ); -// OUString pastComment = extractStringProperty( past, st.DESCRIPTION ); -// if( futureComment != pastComment ) -// { -// buf = OUStringBuffer( 128 ); -// buf.append( "COMMENT ON COLUMN" ); -// bufferQuoteQualifiedIdentifier( buf, schemaName, tableName , futureColumnName ); -// buf.append( "IS " ); -// bufferQuoteConstant( buf, futureComment,encoding); -// transaction.executeUpdate( buf.makeStringAndClear() ); -// } -// transaction.commit(); -// } void KeyColumns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future ) diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index d6e6aaa21541..62058d464162 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -771,9 +771,9 @@ ComponentContext::ComponentContext( { // singleton entry m_map[ rEntry.name ] = new ContextEntry( Any(), true ); - // /service + // service m_map[ rEntry.name + "/service" ] = new ContextEntry( rEntry.value, false ); - // /initial-arguments are provided as optional context entry + // initial-arguments are provided as optional context entry } else { diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 9d7bb4bc247d..4e59773a9cb0 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -213,21 +213,6 @@ namespace drawinglayer } } - // This is needed to check hit with 3D shadows, too. HitTest is without shadow - // to keep compatible with previous versions. Keeping here as reference - // - // if(!getHit()) - // { - // // if scene has shadow, check hit with shadow, too - // const primitive2d::Primitive2DSequence xExtracted2DSceneShadow(rCandidate.getShadow2D(getViewInformation2D())); - // - // if(xExtracted2DSceneShadow.hasElements()) - // { - // // process extracted 2D content - // process(xExtracted2DSceneShadow); - // } - // } - if(!getHit()) { // empty 3D scene; Check for border hit @@ -236,32 +221,6 @@ namespace drawinglayer mbHit = checkHairlineHitWithTolerance(aOutline, getDiscreteHitTolerance()); } - - // This is what the previous version did. Keeping it here for reference - // - // // 2D Scene primitive containing 3D stuff; extract 2D contour in world coordinates - // // This may be refined later to an own 3D HitTest renderer which processes the 3D - // // geometry directly - // const primitive2d::ScenePrimitive2D& rScenePrimitive2DCandidate(static_cast< const primitive2d::ScenePrimitive2D& >(rCandidate)); - // const primitive2d::Primitive2DSequence xExtracted2DSceneGeometry(rScenePrimitive2DCandidate.getGeometry2D()); - // const primitive2d::Primitive2DSequence xExtracted2DSceneShadow(rScenePrimitive2DCandidate.getShadow2D(getViewInformation2D())); - // - // if(xExtracted2DSceneGeometry.hasElements() || xExtracted2DSceneShadow.hasElements()) - // { - // // process extracted 2D content - // process(xExtracted2DSceneGeometry); - // process(xExtracted2DSceneShadow); - // } - // else - // { - // // empty 3D scene; Check for border hit - // const basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D())); - // if(!aRange.isEmpty()) - // { - // const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); - // mbHit = checkHairlineHitWithTolerance(aOutline, getDiscreteHitTolerance()); - // } - // } } } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 597f60c135e1..e581f38216ae 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -491,7 +491,7 @@ EditUndoSetAttribs::EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, aESel(rESel), aNewAttribs(rNewItems) { // When EditUndoSetAttribs actually is a RemoveAttribs this could be - // /recognize by the empty itemset, but then it would have to be caught in + // recognize by the empty itemset, but then it would have to be caught in // its own place, which possible a setAttribs does with an empty itemset. bSetIsRemove = false; bRemoveParaAttribs = false; diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h index 13268cadb616..eec04aa0854d 100644 --- a/extensions/test/ole/AxTestComponents/Basic.h +++ b/extensions/test/ole/AxTestComponents/Basic.h @@ -143,12 +143,10 @@ public: STDMETHOD(defaultvalue1)(/*[in, defaultvalue(10)]*/ long val1, /*[in, defaultvalue(3.14)]*/ double* val2, - // /*[in, defaultvalue(10)]*/ VARIANT val3, /*[in, defaultvalue(100)]*/ VARIANT* val4); STDMETHOD(defaultvalue2)(/*[in, out, defaultvalue(10)]*/ long* val1, /*[in, out, defaultvalue(3.14)]*/ double* val2, - // /*[in, out, defaultvalue(10)]*/ VARIANT* val3, /*[in, out, defaultvalue(100)]*/ VARIANT* val4); STDMETHOD(varargfunc1)(/*[in]*/ long val1,/*[in]*/ LPSAFEARRAY val2); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 5b576d2ef5c7..1f6fec52033e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4952,11 +4952,11 @@ SvStream* EscherExGlobal::ImplQueryPictureStream() return 0; } -// /Implementation of an empty stream that silently succeeds, but does nothing. -// / -// /In fact, this is a hack. The right solution is to abstract EscherEx to be -// /able to work without SvStream; but at the moment it is better to live with -// /this I guess. +// Implementation of an empty stream that silently succeeds, but does nothing. +// +// In fact, this is a hack. The right solution is to abstract EscherEx to be +// able to work without SvStream; but at the moment it is better to live with +// this I guess. class SvNullStream : public SvStream { protected: diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index de096949c017..eac48209ca60 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -475,7 +475,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE if ( databaseContext.hasByName( m_dataSourceName ) ) namingService.revokeObject( m_dataSourceName ); - // // create a new ODB file, and register it with its URL + // create a new ODB file, and register it with its URL m_databaseDocument = new HsqlDatabase( m_orb ); String documentURL = m_databaseDocument.getDocumentURL(); namingService.registerObject( m_dataSourceName, databaseContext.getByName( documentURL ) ); diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 1e1775cf7e0a..e34fac8894c2 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -1189,7 +1189,7 @@ void ScUndoImportData::Redo() nCol1, nRow1, nCol2, nRow2 ); } bool bMoveCells = pUndoDBData && pRedoDBData && - pRedoDBData->IsDoSize(); // // the same in old and new + pRedoDBData->IsDoSize(); // the same in old and new if (bMoveCells) { // Redo: FitBlock, then delete data (needed for CopyToDocument) diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index 3c6add511935..5159b1986d19 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -13,8 +13,7 @@ // module as an individual, optional part, so that the core installation does // not feature a dependency on a poppler package. -// The -// /org.openoffice.TypeDetection.Types/Types/pdf_Portable_Document_Format +// The /org.openoffice.TypeDetection.Types/Types/pdf_Portable_Document_Format // configuration node contained in pdfimport.xcd needs to override a // node with the same name but which lacks import functionality and // which is duplicated across calc, draw, impress, math, writer .xcd diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 604544352bdc..f1af9617e50c 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -4021,21 +4021,6 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) double fScaleX = ( aGraphicSize.Width() - rOldCrop.GetLeft() - rOldCrop.GetRight() ) / (double)aOldRect.GetWidth(); double fScaleY = ( aGraphicSize.Height() - rOldCrop.GetTop() - rOldCrop.GetBottom() ) / (double)aOldRect.GetHeight(); - // not needed since the modification is done in unit coordinates, free from shear/rotate and mirror - // // TTTT may be removed or exchanged by other stuff in aw080 - // // to correct the never working combination of cropped images and mirroring - // // I have to correct the rectangles the calculation is based on here. In the current - // // core geometry stuff a vertical mirror is expressed as 180 degree rotation. All - // // this can be removed again when aw080 will have cleaned up the old - // // (non-)transformation mess in the core. - // if(18000 == pObj->GetGeoStat().nRotationAngle) - // { - // // old notation of vertical mirror, need to correct diffs since both rects - // // are rotated by 180 degrees - // aOldRect = Rectangle(aOldRect.TopLeft() - (aOldRect.BottomRight() - aOldRect.TopLeft()), aOldRect.TopLeft()); - // aNewRect = Rectangle(aNewRect.TopLeft() - (aNewRect.BottomRight() - aNewRect.TopLeft()), aNewRect.TopLeft()); - // } - sal_Int32 nDiffLeft = aNewRect.Left() - aOldRect.Left(); sal_Int32 nDiffTop = aNewRect.Top() - aOldRect.Top(); sal_Int32 nDiffRight = aNewRect.Right() - aOldRect.Right(); diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index f0793a18341b..3cd6d8f795a7 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1424,7 +1424,7 @@ interface BaseText StateMethod = GetTextCtrlState; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - SID_ATTR_CHAR_AUTOKERN // // status(final|play) + SID_ATTR_CHAR_AUTOKERN // status(final|play) [ ExecMethod = ExecTextCtrl; StateMethod = GetTextCtrlState; diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi index 12700e27e9e0..f0a47ddba709 100644 --- a/sw/sdi/annotsh.sdi +++ b/sw/sdi/annotsh.sdi @@ -261,7 +261,7 @@ interface Annotation : _Annotation DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - SID_ATTR_CHAR_AUTOKERN // // status(final|play) + SID_ATTR_CHAR_AUTOKERN // status(final|play) [ ExecMethod = Exec ; StateMethod = GetState ; diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index 4bdcea5e7135..1fdf23f3eed4 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -680,7 +680,7 @@ interface TextDrawFont StateMethod = GetDrawTextCtrlState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - SID_ATTR_CHAR_AUTOKERN // // status(final|play) + SID_ATTR_CHAR_AUTOKERN // status(final|play) [ ExecMethod = Execute ; StateMethod = GetDrawTextCtrlState ; diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index e4d259de962d..a8e1543366ae 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -251,7 +251,7 @@ void SwEditShell::UpdateFields( SwField &rField ) SET_CURR_SHELL( this ); StartAllAction(); { - // // If there are no selections so take the value of the current cursor position. + // If there are no selections so take the value of the current cursor position. SwMsgPoolItem* pMsgHint = 0; SwRefMarkFieldUpdate aRefMkHt( GetOut() ); sal_uInt16 nFieldWhich = rField.GetTyp()->Which(); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index ee400cb05ef2..4881531c9273 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -591,7 +591,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed ) OutCSS1_SwPageDesc( *this, *pFirstPageDesc, pStylePoolAccess, pTemplate, nFirstRefPoolId, false ); } -// /Feature: PrintExt // The text body style has to be exported always (if it is changed compared // to the template), because it is used as reference for any style diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index eb5f799f078f..ee3faef3cdb1 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -182,7 +182,6 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet, return bSetBreak; } -// /Feature: PrintExt static void SetCharFormatAttrs( SwCharFormat *pCharFormat, SfxItemSet& rItemSet ) { @@ -331,9 +330,7 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet, } } -// Feature: PrintExt pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo ); -// /Feature: PrintExt pColl->SetFormatAttr( rItemSet ); } @@ -554,7 +551,6 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, if( bChanged ) ChgPageDesc( pPageDesc, aNewPageDesc ); } -// /Feature: PrintExt SvxBrushItem SwCSS1Parser::makePageDescBackground() const { diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 0184637824a9..665384db7d5b 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -510,10 +510,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, } } -// Feature: PrintExt if( !bCharLvl ) pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo ); -// /Feature: PrintExt OSL_ENSURE(aContexts.size() <= nContextStAttrMin || aContexts.back() != pContext, diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 633e6aebd10e..b5042edc18ad 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -161,13 +161,11 @@ CSS1Token CSS1Parser::GetNextToken() if( aToken.equalsIgnoreAsciiCase( "import" ) ) nRet = CSS1_IMPORT_SYM; break; -// /Feature: PrintExt case 'p': case 'P': if( aToken.equalsIgnoreAsciiCase( "page" ) ) nRet = CSS1_PAGE_SYM; break; -// /Feature: PrintExt } // Fehlerbehandlung: '@ident' und alles bis @@ -691,9 +689,7 @@ void CSS1Parser::ParseStyleSheet() case CSS1_IDENT: // Look-Aheads case CSS1_DOT_W_WS: case CSS1_HASH: -// /Feature: PrintExt case CSS1_PAGE_SYM: -// /Feature: PrintExt // rule bDone = true; break; @@ -718,9 +714,7 @@ void CSS1Parser::ParseStyleSheet() case CSS1_IDENT: // Look-Aheads case CSS1_DOT_W_WS: case CSS1_HASH: -// /Feature: PrintExt case CSS1_PAGE_SYM: -// /Feature: PrintExt // rule ParseRule(); break; @@ -917,14 +911,12 @@ CSS1Selector *CSS1Parser::ParseSelector() } break; -// /Feature: PrintExt case CSS1_PAGE_SYM: { // @page pNew = new CSS1Selector( CSS1_SELTYPE_PAGE, aToken ); } break; -// /Feature: PrintExt default: // wir wissen nicht was kommt, also aufhoehren diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index ff369b19c6fd..bdd1bee2cbeb 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -214,7 +214,6 @@ static CSS1PropertyEnum const aPageBreakTable[] = { 0, 0 } }; -// /Feature: PrintExt static sal_uInt16 const aBorderWidths[] = { @@ -371,11 +370,9 @@ SvxCSS1PropertyInfo::SvxCSS1PropertyInfo( const SvxCSS1PropertyInfo& rProp ) : eTopType( rProp.eTopType ), eWidthType( rProp.eWidthType ), eHeightType( rProp.eHeightType ), -// Feature: PrintExt eSizeType( rProp.eSizeType ), ePageBreakBefore( rProp.ePageBreakBefore ), ePageBreakAfter( rProp.ePageBreakAfter ) -// /Feature: PrintExt { for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i ) aBorderInfos[i] = rProp.aBorderInfos[i] @@ -484,8 +481,6 @@ void SvxCSS1PropertyInfo::Merge( const SvxCSS1PropertyInfo& rProp ) if( rProp.ePageBreakAfter != SVX_CSS1_PBREAK_NONE ) ePageBreakAfter = rProp.ePageBreakAfter; -// /Feature: PrintExt - if( rProp.eLeftType != SVX_CSS1_LTYPE_NONE ) { eLeftType = rProp.eLeftType; @@ -2937,10 +2932,6 @@ static void ParseCSS1_size( const CSS1Expression *pExpr, } } -// /Feature: PrintExt - -// Feature: PrintExt - static void ParseCSS1_page_break_xxx( const CSS1Expression *pExpr, SvxCSS1PageBreak& rPBreak ) { @@ -3026,7 +3017,6 @@ static void ParseCSS1_orphans( const CSS1Expression *pExpr, rItemSet.Put( aOrphansItem ); } } -// /Feature: PrintExt static void ParseCSS1_so_language( const CSS1Expression *pExpr, SfxItemSet &rItemSet, @@ -3118,14 +3108,12 @@ static CSS1PropEntry aCSS1PropFnTab[] = CSS1_PROP_ENTRY(top), CSS1_PROP_ENTRY(width), CSS1_PROP_ENTRY(height), -// Feature: PrintExt CSS1_PROP_ENTRY(size), CSS1_PROP_ENTRY(page_break_before), CSS1_PROP_ENTRY(page_break_after), CSS1_PROP_ENTRY(page_break_inside), CSS1_PROP_ENTRY(widows), CSS1_PROP_ENTRY(orphans), -// /Feature: PrintExt CSS1_PROP_ENTRY(so_language) }; diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 231fc49236ad..d35f8ef1a64a 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -73,7 +73,6 @@ enum SvxCSS1PageBreak SVX_CSS1_PBREAK_END }; -// /Feature: PrintExt #define CSS1_SCRIPT_WESTERN 0x01 #define CSS1_SCRIPT_CJK 0x02 @@ -128,12 +127,10 @@ public: SvxCSS1LengthType eLeftType, eTopType; SvxCSS1LengthType eWidthType, eHeightType; -// Feature: PrintExt SvxCSS1SizeType eSizeType; SvxCSS1PageBreak ePageBreakBefore; SvxCSS1PageBreak ePageBreakAfter; -// /Feature: PrintExt SvxCSS1PropertyInfo(); SvxCSS1PropertyInfo( const SvxCSS1PropertyInfo& rProp ); diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 06e539dafe70..b87794a099dc 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -123,7 +123,6 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ } else { - // /> aBuffer.append( "/>" ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index fd02ded97be3..95a46f925673 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -5927,7 +5927,7 @@ bool PDFWriterImpl::emitCatalog() aLine.append( "/DR " ); aLine.append( getResourceDictObj() ); aLine.append( " 0 R" ); - // /NeedAppearances must not be used if PDF is signed + // NeedAppearances must not be used if PDF is signed if( m_bIsPDF_A1 #if !defined(ANDROID) && !defined(IOS) || ( m_nSignatureObject != -1 ) |