diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 17:54:00 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 22:41:11 +0200 |
commit | 160a4dd9a35488786a3cd4aa1c4c1a74997e7b7e (patch) | |
tree | 98c1cb448cc2637f3e1671f18e03192b82389c50 | |
parent | fdo#62475 - remove visual noise (diff) | |
download | core-160a4dd9a35488786a3cd4aa1c4c1a74997e7b7e.tar.gz core-160a4dd9a35488786a3cd4aa1c4c1a74997e7b7e.zip |
deleted code that was commented out
This is a follow up commit to
- 22d1beb78a475e4846af945afde1c4d6c263b5d6
- 1c7af455ab9345304a7ac48ce2e0310de2ac8a75
Change-Id: I7a67c3768c0d7e36784ee88fc46680037acb244d
-rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/APreparedStatement.cxx | 9 | ||||
-rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 51 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.hxx | 1 |
6 files changed, 3 insertions, 67 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index b5fc41d193a6..8d295f84a833 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -2017,9 +2017,6 @@ void release(oslInterlockedCount& _refCount, ::osl::MutexGuard aGuard( rBHelper.rMutex ); _xInterface = xParent; } - -// // destroy the object if xHoldAlive decrement the refcount to 0 -// m_pDerivedImplementation->WEAK::release(); } } else diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index d402d07df8e9..854abca05f4a 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -148,13 +148,8 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc checkDisposed(OStatement_BASE::rBHelper.bDisposed); SQLWarning warning; - - // Reset warnings clearWarnings (); - // Reset the statement handle, warning and saved Resultset - // reset(); - // Call SQLExecute try { ADORecordset* pSet=NULL; @@ -398,7 +393,6 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any ) ); ::dbtools::throwGenericSQLException(sError,*this); } - // setObject (parameterIndex, x, sqlType, 0); } void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException) @@ -449,14 +443,11 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim CHECK_RETURN(aParam.PutValue(aVal)); } } - // m_pParameters->Delete(OLEVariant(i)); } } void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException) { - // clearParameters( ); - // m_aBatchList.erase(); } void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException) diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index f3bd629f3d14..cf5289a484bd 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -177,8 +177,6 @@ namespace drawinglayer aFont.SetUnderline( eFontUnderline ); if( pTCPP->getWordLineMode() ) aFont.SetWordLineMode( true ); -//TODO: ??? if( pTCPP->getUnderlineAbove() ) -// aFont.SetUnderlineAbove( true ); } // set Strikeout attribute diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index df64c9bf9e24..bdd2658deb50 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -603,8 +603,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 { switch( nType ) { -// case OBJ_NONE: -// break; case OBJ_GRUP: pRet = new SvxShapeGroup( pObj, mpPage ); break; @@ -730,8 +728,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 case OBJ_MEASURE: pRet = new SvxShapeDimensioning( pObj ); break; -// case OBJ_DUMMY: -// break; case OBJ_UNO: pRet = new SvxShapeControl( pObj ); break; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index d3c6c736cc8d..63fdebcdd925 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1080,17 +1080,7 @@ public: sal_uInt16 wMagicRevised; // identifies the File's last modifier sal_uInt16 wMagicCreatedPrivate; // private data sal_uInt16 wMagicRevisedPrivate; // private data - /* - sal_Int16 pnFbpChpFirst_W6; // not used - sal_Int16 pnChpFirst_W6; // not used - sal_Int16 cpnBteChp_W6; // not used - sal_Int16 pnFbpPapFirst_W6; // not used - sal_Int16 pnPapFirst_W6; // not used - sal_Int16 cpnBtePap_W6; // not used - sal_Int16 pnFbpLvcFirst_W6; // not used - sal_Int16 pnLvcFirst_W6; // not used - sal_Int16 cpnBteLvc_W6; // not used - */ + sal_Int16 lidFE; // Language id if document was written by Far East version // of Word (i.e. FIB.fFarEast is on) sal_uInt16 clw; // Number of fields in the array of longs @@ -1129,16 +1119,7 @@ public: // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces // starting with this pn - /* - // folgende Felder existieren zwar so in der Datei, - // wir benutzen jedoch unten deklarierte General-Variablen - // fuer Ver67 und Ver8 gemeinsam. - sal_Int32 pnPapFirst; // the page number of the lowest numbered page in the - // document that records PAPX FKP information - sal_Int32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex - // files if the number of entries in the PLCFbtePapx is - // less than this, the PLCFbtePapx is incomplete. - */ + sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces @@ -1282,27 +1263,6 @@ public: WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument sal_Int32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument - // Einschubs fuer WW67 *************************************************** - - // sal_Int16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden - - /* - // folgende Felder existieren zwar so in der Datei, - // wir benutzen jedoch unten deklarierte General-Variablen - // fuer Ver67 und Ver8 gemeinsam. - WW8_PN pnChpFirst; // the page number of the lowest numbered page in - // the document that records CHPX FKP information - WW8_PN pnPapFirst; // the page number of the lowest numbered page in - // the document that records PAPX FKP information - - WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex - // files if the number of entries in the PLCFbteChpx is - // less than this, the PLCFbteChpx is incomplete. - WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex - // files if the number of entries in the PLCFbtePapx is - // less than this, the PLCFbtePapx is incomplete. - */ - // Ende des Einschubs fuer WW67 ****************************************** WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document. @@ -1595,12 +1555,7 @@ public: sal_uInt16 rncEdn : 2; // restart endnote number code: 0 don't restart endnote numbering, 1 section, 2 page sal_uInt16 nEdn : 14; // beginning endnote number sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document - // sal_uInt16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman - // 3 Upper case Letter, 4 Lower case Letter - // ersetzt durch gleichlautendes Feld unten - // sal_uInt16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman - // 3 Upper case Letter, 4 Lower case Letter - // ersetzt durch gleichlautendes Feld unten + sal_uInt16 fPrintFormData : 1; // only print data inside of form fields sal_uInt16 fSaveFormData : 1; // only save document data that is inside of a form field. sal_uInt16 fShadeFormData : 1; // shade form fields diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 5aee0a0ffcc3..ed7223f9f6b9 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -49,7 +49,6 @@ struct Seitenformat { sal_Int16 RandU; // unten dem Papier sal_uInt8 PColor; // Future Use sal_uInt8 PIntens; // erst recht Future use -// sal_Bool BorderClip; // Objekte am Rand abschneiden (Schummel wg. Allignment unter NT) }; #define PageSize 146 |