diff options
58 files changed, 12 insertions, 1290 deletions
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index 4ac7156eb2ae..27ef124b5e41 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -173,15 +173,6 @@ OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const } //____________________________________________________________________________________________________________ -// operator -//____________________________________________________________________________________________________________ - -//OMRCListenerMultiplexerHelper& OMRCListenerMultiplexerHelper::operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance ) -//{ -// return this ; -//} - -//____________________________________________________________________________________________________________ // container method //____________________________________________________________________________________________________________ diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index ed620a4f6751..fb66ef3bfa74 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -42,8 +42,6 @@ public: ~RetStream(); using CmdBaseStream::GenError; -// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );} -// new void GenError( SmartId aUId, String aString ); using CmdBaseStream::GenReturn; @@ -55,7 +53,6 @@ public: void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} -// new void GenReturn( USHORT nRet, SmartId aUId, String aString ); void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue ); void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ); @@ -72,7 +69,6 @@ public: void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );} void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );} void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );} -// new void Write( SbxValue &aValue ); // Complex Datatypes to be handled system dependent diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx index d578909ad3ab..e2725b6f0070 100644 --- a/automation/source/server/scmdstrm.hxx +++ b/automation/source/server/scmdstrm.hxx @@ -49,9 +49,7 @@ public: using CmdBaseStream::Read; void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} -// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} -// new void Read ( String &aString ); void Read ( SfxPoolItem *&pItem ); void Read ( ::com::sun::star::beans::PropertyValue &rItem ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index dd2e4cbd0129..62d5f13ba897 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -342,7 +342,6 @@ void ExtraIdle::Timeout() { #if OSL_DEBUG_LEVEL > 1 -//#define TT_NO_DECRYPT #define TT_CODE #else #define TT_CODE @@ -485,11 +484,7 @@ void ExtraIdle::Timeout() "1EIGpcw0WfiaOul1s19ZIECoLBx-#S"; -//#if OSL_DEBUG_LEVEL > 1 -// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC ); -//#else SvMemoryStream aStream; -//#endif xub_StrLen c; xub_StrLen cRest = 0; @@ -529,43 +524,6 @@ void ExtraIdle::Timeout() ::svt::OStringTransfer::CopyString( CUniString("\nSorry! no bitmap"), StatementList::GetFirstDocFrame() ); } -/*********************************************************************** -// USHORT nBC = pBmp->GetBitCount(); -// pBmp->Scale( 0.02, 0.02 ); -// nBC = pBmp->GetBitCount(); -// SvMemoryStream aStream; - SvFileStream aStream( "d:\gh_small50.jpg", STREAM_STD_READ ); - - aStream.Seek( 0 ); - xub_StrLen c; - String aOut; - String aDreierGruppe; - xub_StrLen cRest=0; - aStream >> c; - while ( !aStream.IsEof() ) - { - cRest <<= 2; // Im ersten Durchgang egal, da immer 0 - cRest |= ( c & 0x03 ); - c >>= 2; - aDreierGruppe += aTr.GetChar( c ); - - if ( aDreierGruppe.Len() == 3 ) - { - aOut += aTr.GetChar( cRest ); - aOut += aDreierGruppe; - cRest = 0; - aDreierGruppe = ""; - } - aStream >> c; - } - if ( aDreierGruppe.Len() ) - { - aOut += cRest; - aOut += aDreierGruppe; - } - ::svt::OStringTransfer::CopyString( aOut ); -**********************************************************************************/ - new StatementSlot( StatementList::pTTProperties->nSidPaste ); return; } @@ -646,9 +604,6 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) #endif StatementList *pC = StatementList::pFirst; -// MessBox MB( pMainWin, WB_DEF_OK|WB_OK, "Pause ...", "... und Weiter" ); -// MB.Execute(); - if ( !StatementList::bCatchGPF ) { if (!pC->CheckWindowWait() || !pC->Execute()) @@ -697,24 +652,11 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) } } -/* #i46293# remove reschedules - for (int xx = 1;xx < 20;xx++) - StatementList::NormalReschedule(); -*/ m_bInsideExecutionLoop = FALSE; } StatementList::aWindowWaitUId = SmartId(); // Warten rcksetzen, da handler sowieso verlassen wird -/* if( StatementList::pFirst && !StatementList::bReadingCommands ) - // Abfrage ntig, da andere CommandHdl aktiv sein knnen oder - // neue Commands gelesen werden knnen - { - delete StatementList::pFirst; // Lscht die gesamte Liste !! - StatementList::pFirst = NULL; - StatementList::pCurrent = NULL; // Nur zur Sicherheit, sollte hier sowieso NULL sein - }*/ - #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Leaving CommandHdl\n" ); #endif @@ -731,7 +673,6 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL ) BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) { -// return TRUE; USHORT nId; if( !m_bIdleInserted ) diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 756cfa980114..fbc046cddf42 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -129,12 +129,6 @@ TTSettings* GetTTSettings() #define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 )) -/* -UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } -UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } -UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } -UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );} -*/ StatementList::StatementList() : nRetryCount(MAX_RETRIES) , bStatementInQue(FALSE) @@ -301,8 +295,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB while ( pPParent->GET_REAL_PARENT() ) pPParent = pPParent->GET_REAL_PARENT(); -// if ( !IsFirstDocFrame( pPParent ) ) -// { // get overlap window. Will be dialog else document itself pBase = pBase->GetWindow( WINDOW_OVERLAP ); @@ -321,16 +313,11 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pControl ) return pControl; -// } } } pBase = Application::GetFirstTopLevelWindow(); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); - while ( pBase ) { pControl = SearchAllWin( pBase, aSearch ); @@ -338,9 +325,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB return pControl; pBase = Application::GetNextTopLevelWindow( pBase ); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); } return NULL; } @@ -351,9 +335,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pResult ) return pResult; -// if ( pBase->GetType() != WINDOW_BORDERWINDOW ) -// return NULL; - if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) ) { if ( pBase->GetWindow( WINDOW_FIRSTOVERLAP ) ) @@ -553,8 +534,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) return pBaseMenu; USHORT i; -// while ( pBaseMenu ) -// { i = 0; while ( i < pBaseMenu->GetItemCount() ) { @@ -572,7 +551,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) else i++; } -// } } else { @@ -618,7 +596,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) BOOL SearchActive::IsWinOK( Window *pWin ) { -// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive()); // only matches ResID due to problems with UNIX Window Managers return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ); } @@ -1147,10 +1124,6 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->MouseMove( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { TrackingEvent aTEvt( aMEvnt ); @@ -1191,10 +1164,6 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->ButtonUp( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { // siehe #64693 die Position ist fr Toolboxen relevant diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 315e669ab81c..e2e868a1cd31 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -4155,10 +4155,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( (pControl->GetType() == WINDOW_TOOLBOX) && pTB->IsMenuEnabled() ) { pTB->ExecuteCustomMenu(); -/* Rectangle aRect = pTB->GetMenubuttonRect(); - AnimateMouse( pControl, aRect.Center() ); - MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); - ImplMouseButtonDown( pTB, aMEvnt );*/ } else { @@ -4657,10 +4653,6 @@ BOOL StatementControl::Execute() for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( pTControl->GetPageId(i) ); - pTControl->ActivatePage();*/ aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) @@ -4671,10 +4663,6 @@ BOOL StatementControl::Execute() if ( !aID.Matches( aWantedID ) ) { pTControl->SelectTabPage( nActive ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( nActive ); - pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } } @@ -5841,10 +5829,6 @@ BOOL StatementControl::Execute() else pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1)); break; -/* xxxcase M_SetNoSelection : - ((ListBox*)pControl)->SetNoSelection(); - ((ListBox*)pControl)->Select(); - break; */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "RoadMap" ) ); break; @@ -5875,22 +5859,11 @@ BOOL StatementControl::Execute() { ::svt::table::PTableModel pModel = pTC->GetModel(); Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1]; - /* doesn't work ATM since it gets casted to SbxDATE in VCLTestTool unfortunately - SbxVariableRef xRes = new SbxVariable( SbxVARIANT ); - unoToSbxValue( xRes, aCell ); - pRet->GenReturn ( RET_Value, aUId, *xRes );*/ Type aType = aCell.getValueType(); TypeClass eTypeClass = aType.getTypeClass(); switch( eTypeClass ) { - /*case TypeClass_ENUM: - { - sal_Int32 nEnum = 0; - enum2int( nEnum, aValue ); - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)nEnum ); - } - break;*/ case TypeClass_BOOLEAN: pRet->GenReturn ( RET_Value, aUId, *(sal_Bool*)aCell.getValue() ); break; @@ -5986,18 +5959,6 @@ BOOL StatementControl::Execute() if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) ) pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) ); break; -/* case M_GetSelText : - if ( ! (nParams & PARAM_USHORT_1) ) - nNr1 = 1; - if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) ) - { - nNr1--; - COUNT_LBOX( FirstSelected, NextSelected, nNr1); - GetFirstValidTextItem( pThisEntry ); - pRet->GenReturn ( RET_Value, aUId, pItem->GetText() ); - } - break; - */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "TableControl" ) ); break; diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index a4d2b76f5632..63385b804ed4 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -31,12 +31,6 @@ ** Es gibt immer nur eine Statementliste, die verpointert ist. ** jederzeit kann das der Anfang der Kette abgefragt werden. ** -** -** -** -** -** -** ***************************************************************************/ #ifndef _STATEMNT_HXX #define _STATEMNT_HXX @@ -117,7 +111,6 @@ BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Ka BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (ber IsEnabled und Parents geprft) -//class SafePointer : CriticalSection class SafePointer { SafePointer *pSelf; @@ -125,8 +118,6 @@ public: SafePointer() { pSelf = this; } virtual ~SafePointer() { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen"); pSelf = NULL; } -// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } -// virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); } }; @@ -216,7 +207,6 @@ public: if ( pLastFocusWindow != GetpApp()->GetFocusWindow() || ( Application::GetModalModeCount() > nModalCount ) -// || ( DragManager::GetDragManager() && !bWasDragManager ) || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu ) || ( StarBASIC::IsRunning() && !bBasicWasRunning ) ) { @@ -256,8 +246,6 @@ protected: USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); public: -// void AddStatement( StatementList *pNewStatement ); - virtual ~StatementList(); void Advance(); virtual BOOL Execute() = 0; diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx index 8c206b108926..10cb95570804 100644 --- a/automation/source/testtool/comm_bas.cxx +++ b/automation/source/testtool/comm_bas.cxx @@ -145,7 +145,6 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject( , m_bCatchOpen( FALSE ) , m_pNewLink( NULL ) { -// SetName( CUniString("Manager") ); m_pMethods = &aManagerMethods[0]; m_pManager = new CommunicationManagerClientViaSocket; m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) ); diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 206d74db33ba..f7cbe3309865 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.hxx @@ -45,10 +45,8 @@ public: using CmdBaseStream::Read; void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} -// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} -// new void Read( String &aString ); void Read( SbxValue &aValue ); }; diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index f70270a77a6d..a7297ad79a32 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -121,9 +121,6 @@ public: ControlItem( const char *Name, SmartId aUIdP ); ControlItem( const String &Name, SmartId aUIdP ); -// ControlItem( const String &Name, const String &URL, const URLType aType ); -// ControlItem( const String &Name, const String &URL, const ULONG nUId ); -// ControlItem( const char *Name, const String &URL, const ULONG nUId ); ControlItem( ControlData *pDataP ); virtual ~ControlItem() { DBG_DTOR(ControlItem,0); @@ -131,7 +128,6 @@ DBG_DTOR(ControlItem,0); } virtual BOOL operator < (const ControlItem &rPar)=0; virtual BOOL operator == (const ControlItem &rPar)=0; -// void Write( SvStream &aStream ); }; SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) @@ -149,7 +145,6 @@ protected: public: ControlSon() : pSons( NULL ) {}; ~ControlSon(); -// void Write( SvStream &aStream ); USHORT Son_Count() { return pSons->Count(); } void Sons( CNames *pNewSons ) { pSons = pNewSons; } @@ -162,10 +157,6 @@ public: ControlItemSon(const char *Name, SmartId aUIdP ) : ControlItem( Name, aUIdP ) {} ControlItemSon(const String &Name, SmartId aUIdP ); -// ControlItemSon(const String &Name, const String &URL, const URLType aType ); -// ControlItemSon(const String &Name, const String &URL, const ULONG nUId ); -// ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); -// void Write( SvStream &aStream ); }; class ControlDef : public ControlItemSon @@ -174,7 +165,6 @@ public: ControlDef(const char *Name, SmartId aUIdP ) : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);} ControlDef(const String &Name, SmartId aUIdP ); -// ControlDef(const String &Name, const String &URL, const URLType aType ); ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); ~ControlDef() {DBG_DTOR(ControlDef,0);} virtual BOOL operator < (const ControlItem &rPar); @@ -245,9 +235,6 @@ typedef std::map< String, String > Environment; class ImplTestToolObj { public: -// ImplTestToolObj() -// ~ImplTestToolObj() - String ProgParam; // Parameter der zu Testenden APP; Gesetzt ber Start DirEntry aFileBase; // Grundpfad fr die *.sid und *.win Dateien (Aus Configdatei) diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 6df383e07e2b..db185b2e6a94 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -29,10 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basctl.hxx" - #include <ide_pch.hxx> - #include <svtools/texteng.hxx> #include <svtools/textview.hxx> #include <svtools/xtextedt.hxx> @@ -50,7 +48,6 @@ #include <sfx2/docfile.hxx> #include <basic/basrdll.hxx> - #include <baside2.hrc> #include <baside2.hxx> #include <objdlg.hxx> @@ -252,9 +249,7 @@ void ModulWindow::DoInit() if ( GetVScrollBar() ) GetVScrollBar()->Hide(); GetHScrollBar()->Show(); -// GetEditorWindow().SetScrollBarRanges(); GetEditorWindow().InitScrollBars(); -// GetEditorWindow().GrabFocus(); } @@ -460,8 +455,6 @@ BOOL ModulWindow::LoadBasic() if ( aCurPath.Len() ) xFP->setDisplayDirectory ( aCurPath ); - //xFP->setTitle( String( IDEResId( RID_STR_OPEN ) ) ); - Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); @@ -522,8 +515,6 @@ BOOL ModulWindow::SaveBasicSource() if ( aCurPath.Len() ) xFP->setDisplayDirectory ( aCurPath ); - //xFP->setTitle( String( IDEResId( RID_STR_SAVE ) ) ); - Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) ); @@ -719,8 +710,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic ) BOOL bMarkError = ( pBasic == GetBasic() ) ? TRUE : FALSE; if ( bMarkError ) aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE ); -// ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute(); -// ErrorHandler::HandleError( pBasic->GetErrorCode() ); // #i47002# Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this ); @@ -740,9 +729,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic ) long ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) { DBG_CHKTHIS( ModulWindow, 0 ); - // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer - // das Programm! -// GoOnTop(); // #i69280 Required in Window despite normal usage in next command! (void)pBasic; @@ -795,7 +781,6 @@ void ModulWindow::BasicAddWatch() BOOL bAdd = TRUE; if ( !GetEditView()->HasSelection() ) { -// bAdd = GetEditView()->SelectCurrentWord(); TextPaM aWordStart; String aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart ); if ( aWord.Len() ) @@ -803,7 +788,6 @@ void ModulWindow::BasicAddWatch() TextSelection aSel( aWordStart ); USHORT& rIndex = aSel.GetEnd().GetIndex(); rIndex = rIndex + aWord.Len(); - // aSel.GetEnd().GetIndex() += sal::static_int_cast<int>( aWord.Len() ); GetEditView()->SetSelection( aSel ); bAdd = TRUE; } @@ -890,9 +874,6 @@ void ModulWindow::StoreData() // => Keine Unterbrechungen erwuenscht! // Und bei SAVE, wenn AppBasic... GetEditorWindow().SetSourceInBasic( TRUE ); - // Nicht das Modify loeschen, sonst wird das Basic nicht gespeichert - // Es wird beim Speichern sowieso geloescht. -// xModule->SetModified( FALSE ); } BOOL ModulWindow::CanClose() @@ -956,7 +937,6 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) MapMode eOldMapMode( pPrinter->GetMapMode() ); Font aOldFont( pPrinter->GetFont() ); -// Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) ); Font aFont( GetEditEngine()->GetFont() ); aFont.SetAlign( ALIGN_BOTTOM ); aFont.SetTransparent( TRUE ); @@ -1240,8 +1220,6 @@ String ModulWindow::GetTitle() void ModulWindow::FrameWindowMoved() { -// if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() ) -// GetEditEngine()->StopSelectionMode(); } @@ -1512,7 +1490,6 @@ void ModulWindowLayout::Resize() { // ScrollBars, etc. passiert in BasicIDEShell:Adjust... ArrangeWindows(); -// Invalidate(); } void ModulWindowLayout::Paint( const Rectangle& ) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4dcaf94ef75f..1d1ede072ca8 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -855,12 +855,6 @@ IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG ) p = aSyntaxLineTable.Next(); } - // MT: Removed, because of idle format now when set/remove attribs... - // pEditView->SetAutoScroll( FALSE ); // #101043# Don't scroll because of syntax highlight - // pEditEngine->SetUpdateMode( TRUE ); - // pEditView->ShowCursor( FALSE, TRUE ); - // pEditView->SetAutoScroll( TRUE ); - // #i45572# if ( pEditView ) pEditView->ShowCursor( FALSE, TRUE ); @@ -1454,7 +1448,6 @@ IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar ) sal_Int32 nPos = 0; USHORT nTabs = aHeaderBar.GetItemCount(); - // OSL_ASSERT( m_treelb->TabCount() == nTabs ); for( USHORT i = 1 ; i < nTabs ; ++i ) { nPos += aHeaderBar.GetItemSize( i ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 704da8350c33..613a05b32673 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -29,16 +29,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basctl.hxx" -//svdraw.hxx -//#define _SVDRAW_HXX *** #define _SDR_NOITEMS #define _SDR_NOTOUCH #define _SDR_NOTRANSFORM #define _SDR_NOOBJECTS -//#define _SDR_NOVIEWS *** #define _SDR_NOVIEWMARKER #define _SDR_NODRAGMETHODS -//#define _SDR_NOUNDO *** #define _SDR_NOXOUTDEV #include <ide_pch.hxx> diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 850bd4e627e2..bea7cb64825c 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -67,45 +67,11 @@ IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, E } IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG ) -/* -IMPL_LINK( BasicIDEShell, ObjectDialogInsertHdl, ObjectCatalog *, pObjCat ) -{ - if ( !pCurWin ) - return 0; - - if ( pCurWin->IsA( TYPE( ModulWindow ) ) ) - { - ModulWindow* pEditWin = (ModulWindow*)pCurWin; - pEditWin->InsertFromObjectCatalog( pObjCat ); - } - else - Sound::Beep(); - - return 0; -} -*/ - Reference< view::XRenderable > BasicIDEShell::GetRenderable() { return Reference< view::XRenderable >( new basicide::BasicRenderable( pCurWin ) ); } -#if 0 -USHORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog ) -{ - if ( pCurWin ) - { - SfxPrinter* pPrinter = GetPrinter( TRUE ); - if ( pPrinter ) - { - SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog ); - pCurWin->PrintData( pPrinter ); - } - } - return 0; -} -#endif - BOOL BasicIDEShell::HasSelection( BOOL /* bText */ ) const { BOOL bSel = FALSE; @@ -128,10 +94,7 @@ String BasicIDEShell::GetSelectionText( BOOL bWholeWord ) { if ( bWholeWord && !pEditView->HasSelection() ) { - // String aStrCurrentDelimiters = pEngine->GetWordDelimiters(); - // pEngine->SetWordDelimiters( " .,;\"'" ); aText = pEditView->GetTextEngine()->GetWord( pEditView->GetSelection().GetEnd() ); - // pEngine->SetWordDelimiters( aStrCurrentDelimiters ); } else { diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 35c4eafbebf1..6d15f5a9a74f 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -102,7 +102,6 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ) { BOOL bValid = FALSE; String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( "Macro" ) ); - //String aStdMacroText( IDEResId( RID_STR_STDMACRONAME ) ); USHORT nMacro = 1; while ( !bValid ) { @@ -386,15 +385,6 @@ void BasicStopped( BOOL* pbAppWindowDisabled, *pnWaitCount = nWait; } - /* - // Interactive = FALSE ? - if ( SFX_APP()->IsDispatcherLocked() ) - { - SFX_APP()->LockDispatcher( FALSE ); - if ( pbDispatcherLocked ) - *pbDispatcherLocked = TRUE; - } */ - Window* pDefParent = Application::GetDefDialogParent(); if ( pDefParent && !pDefParent->IsEnabled() ) { diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index be57acc4ed98..e4f4530ed2ff 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -33,7 +33,6 @@ #include <vcl/sound.hxx> -// #define ITEMID_SEARCH SID_SEARCH_ITEM #define _SVX_NOIDERESIDS #include <brkdlg.hxx> #include <brkdlg.hrc> @@ -96,7 +95,6 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); -// aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) ); aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl ) ); @@ -247,10 +245,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) } CheckButtons(); } -// else if ( pButton == &aShowButton ) -// { -// ; -// } return 0; } diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ebceaed39af4..ff894606e74d 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -29,14 +29,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basctl.hxx" - #define GLOBALOVERFLOW #include <ide_pch.hxx> #include <svtools/filedlg.hxx> - #include <sot/storinfo.hxx> #include <moduldlg.hrc> @@ -331,16 +329,6 @@ BOOL BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) // TODO: check if library is reference/link - // Prueffen, ob Referenz... - /* - USHORT nLib = pBasMgr->GetLibId( GetEntryText( pEntry, 0 ) ); - DBG_ASSERT( nLib != LIB_NOTFOUND, "LibId ?!" ); - if ( pBasMgr->IsReference( nLib ) ) - { - ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_CANNOTCHANGENAMEREFLIB ) ) ).Execute(); - return FALSE; - } - */ return TRUE; } diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx index 6a1461c78640..62b550aa7348 100644 --- a/basctl/source/basicide/tbxctl.hxx +++ b/basctl/source/basicide/tbxctl.hxx @@ -31,33 +31,6 @@ #include <sfx2/tbxctrl.hxx> #include <com/sun/star/frame/XLayoutManager.hpp> -/* -#ifdef _BASIDE_POPUPWINDOWTBX - -// class PopupWindowTbx -------------------------------------------------- - -class PopupWindowTbx : public SfxPopupWindow -{ -private: - SfxToolBoxManager aTbx; - Link aSelectLink; - - DECL_LINK( SelectHdl, void* ); - -public: - PopupWindowTbx( USHORT nId, WindowAlign eAlign, - ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind ); - ~PopupWindowTbx(); - - void StartSelection() - { aTbx.GetToolBox().StartSelection(); } - void Update(); - - virtual SfxPopupWindow* Clone() const; - virtual void PopupModeEnd(); -}; -#endif -*/ //------------------- // class TbxControls //------------------- diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 9ef46deb69c0..5b640b648f54 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -580,28 +580,9 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) if (pView->IsAction() ) { pView->EndAction(); - //if( bMarkAction ) - //pParent->UnmarkDialog(); } } -// USHORT nClicks = rMEvt.GetClicks(); -// if (nClicks == 2) -// { -// if ( pView->AreObjectsMarked() ) -// { -// const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); -// -// if (rMarkList.GetMarkCount() == 1) -// { -// SdrMark* pMark = rMarkList.GetMark(0); -// SdrObject* pObj = pMark->GetMarkedSdrObj(); -// -// // edit objects here -// } -// } -// } - bMarkAction = FALSE; pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) ); diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index 41fa01b262c8..1cef4b9762ba 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.cxx @@ -53,13 +53,6 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl() void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) { - /* - // disconnect the listener - if (pDlgEdObj) - { - (pDlgEdObj->m_xPropertyChangeListener).clear(); - } - */ } // XPropertyChangeListener @@ -94,13 +87,6 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl() void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) { - /* - // disconnect the listener - if (pDlgEdObj) - { - (pDlgEdObj->m_xContainerListener).clear(); - } - */ } // XContainerListener diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 080fca450279..a6d29fc5f464 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -483,12 +483,6 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) { aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES))); } - // #i73075 Handled in implSetNewObjectSequence - //else // multiselection - //{ - // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); - // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); - //} return aName; } diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b0e21d180e52..214234dac155 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -156,23 +156,6 @@ String lcl_MakeTabEntry(const SfxFilter* pFilter) BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) { BOOL bRet = FALSE; -/*!!! (pb) needs new implementation - String aIniEntry; - String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), - String::CreateFromAscii("java") ); - INetURLObject aIniFileObj( aFullName, INET_PROT_FILE ); - String aIniPath = aIniFileObj.getName(); - if ( pIniMgr->SearchFile( aIniPath ) ) - { - Config aJavaCfg( aIniPath ); - aJavaCfg.SetGroup( "Java" ); - ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) ); - String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8); - String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8); - if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() ) - bRet = TRUE; - } -*/ return bRet; } @@ -216,12 +199,9 @@ void SvxNoSpaceEdit::Modify() } /********************************************************************/ -/********************************************************************/ /* */ /* SvxProxyTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -683,12 +663,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ -/********************************************************************/ /* */ /* SvxSearchTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -1099,104 +1076,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - -/********************************************************************/ -/********************************************************************/ -/* */ -/* SvxOtherTabPage */ -/* */ -/********************************************************************/ -/********************************************************************/ - -/* -SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : - - PatternField( pParent, rResId ), - - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) - -{ - FreeResource(); - SelectFixedFont(); -} */ - -/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt ) -{ - PatternField::KeyInput( rKEvt ); - BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ); - String sEntry( GetText() ); - sEntry[(USHORT)3] = '.'; - sEntry[(USHORT)7] = '.'; - sEntry[(USHORT)11] = '.'; - Selection aSelection( GetSelection() ); - String sPart( sEntry.GetToken( 0, '.' ) ); - USHORT i, nPart( sPart.EraseLeadingChars() ); - BOOL bSet = FALSE; - - if ( sPart.Len() && ( !nPart || nPart > 255 ) ) - { - // der erste Part darf nicht 0 und nicht gr"osser 255 sein - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg233; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( 0, '.', sPart ); - bSet = TRUE; - }; - - for ( i = 1; i < 4; i++ ) - { - // die anderen Parts d"urfen nicht gr"osser 255 sein - sPart = sEntry.GetToken( i, '.' ); - nPart = sPart.EraseLeadingChars(); - - if ( nPart > 255 ) - { - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg255; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( i, '.', sPart ); - bSet = TRUE; - }; - } - - if ( bSet ) - { - SetText( sEntry ); - SetSelection( aSelection ); - } -} -*/ -// ----------------------------------------------------------------------- -#if 0 -long SvxPatternField::Notify( NotifyEvent& rNEvt ) -{ - return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; - - if ( rNEvt.GetType() == EVENT_KEYUP ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyInput( *pKEvt ); - nHandled = 1; - } - return nHandled;*/ -} -#endif - // class JavaScriptDisableQueryBox_Impl -------------------------------------- class JavaScriptDisableQueryBox_Impl : public ModalDialog @@ -1607,18 +1486,9 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { -/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _Img.Show( !b ); - return b; - } -*/ bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, CheckBox& _rCtrl, FixedImage& _rImg ) { -// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg ); bool b = _rOpt.IsOptionEnabled( _eOpt ); _rCtrl.Enable( b ); _rImg.Show( !b ); @@ -1729,7 +1599,6 @@ inline bool getDllURL(rtl::OString * path) return false; } dirPath = dirPath.copy(0, dirPath.lastIndexOf('/')); -// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath); ::rtl::OUString sysDirPath; osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath); *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3d6e4e305df6..caacec11a3bb 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -82,16 +82,6 @@ SvxJavaTable::~SvxJavaTable() void SvxJavaTable::SetTabs() { SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ } void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt ) @@ -181,8 +171,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); m_aResetTimer.SetTimeout( RESET_TIMEOUT ); -//! m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) ); - static long aStaticTabs[]= { 5, 0, 15, 90, 130, 300 @@ -243,13 +231,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() JavaInfo* pInfo = *pIter; jfw_freeJavaInfo( pInfo ); } -/* - rtl_uString** pParamArr = m_parParameters; - for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) - rtl_uString_release( *pParamArr++ ); - rtl_freeMemory( m_parParameters ); - rtl_uString_release( m_pClassPath ); -*/ + jfw_unlock(); } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 337a963c1a3e..49c6048dcc11 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -294,7 +294,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck ) pItem->SetStateChecked(); else pItem->SetStateUnchecked(); - //InvalidateEntry( pEntry ); } } @@ -451,7 +450,6 @@ void OptionsUserData::SetChecked( BOOL bVal ) void OptionsUserData::SetNumericValue( BYTE nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -492,8 +490,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// BOOL bFett = TRUE; -// USHORT nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (ULONG) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -504,9 +500,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); - rDev.SetFont( aOldFont ); } } @@ -1328,7 +1321,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) for (ULONG i = 0; i < nEntries; ++i) { INT32 nDics = aDics.getLength(); -// const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); @@ -1356,7 +1348,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } } - // + aActiveDics.realloc( nActiveDics ); Any aTmp; aTmp <<= aActiveDics; @@ -1430,11 +1422,9 @@ ULONG SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDi { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); -// ULONG nUserData = 0; BOOL bChecked = rxDic->isActive(); BOOL bEditable = !xStor.is() || !xStor->isReadonly(); BOOL bDeletable = bEditable; -// BOOL bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1548,9 +1538,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal; -// const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); -// if (pItem) -// bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_GRAMMAR_AUTO, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1958,7 +1945,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aLinguModulesFT.GetPosPixel().Y(); DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" ); Point aPos; - // + aPos = aLinguDicsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsFT.SetPosPixel( aPos ); @@ -1974,7 +1961,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguDicsDelPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsDelPB.SetPosPixel( aPos ); - // + aPos = aLinguOptionsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsFT.SetPosPixel( aPos ); @@ -1984,7 +1971,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguOptionsEditPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsEditPB.SetPosPixel( aPos ); - // + Size aSize( aLinguOptionsCLB.GetSizePixel() ); aSize.Height() += nDeltaY; aLinguOptionsCLB.SetSizePixel( aSize ); @@ -2146,8 +2133,6 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { -// if (pBox == (SvTreeListBox *) &aModulesCLB) -// { pBox = &aModulesCLB; SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) @@ -2173,7 +2158,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } -// } return 0; } @@ -2197,7 +2181,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2263,8 +2246,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; - ULONG n; ServiceInfo_Impl* pInfo; @@ -2276,7 +2257,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) String(), TRUE, FALSE, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); ULONG nNames = (ULONG) aNames.getLength(); @@ -2320,7 +2301,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2364,7 +2345,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2408,7 +2389,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a2c594cc1b78..ae8dba0ce42e 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -627,7 +627,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } aDocInfoCB.Check(aSaveOpt.IsDocInfoSave()); -// aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aBackupCB.Check(aSaveOpt.IsBackup()); BOOL bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); @@ -637,22 +636,16 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aAutoSaveCB.Check(aSaveOpt.IsAutoSave()); aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat()); aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)); -// aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)); // the pretty printing aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting()); -// aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING )); - aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() ); -// aAutoSaveEdit.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)); // relativ speichern aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() ); -// aRelativeFsysCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)); aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() ); -// aRelativeInetCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET)); void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() ); aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) ); @@ -666,7 +659,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -683,14 +675,12 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); } } return 0; @@ -706,7 +696,6 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) if(!pProperties[nProp].Name.compareToAscii("UIName")) { pProperties[nProp].Value >>= sRet; -//! break; } else if(!pProperties[nProp].Name.compareToAscii("Flags")) { diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 85bc19f67daf..edd01918573c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -470,16 +470,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; nLeft = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nRight ); aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit ); } else { -// nRight = aPageSize.Width() - -// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -503,16 +499,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; nTop = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nBottom); aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit ); } else { -// nBottom = aPageSize.Height() - -// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -605,11 +597,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() nMin = nMinWidth - (nL >= 0 ? nL : 0); aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; - aLeftMF.SetMax(aPageSize.Width() - nR - nMin); - aRightMF.SetMax(aPageSize.Width() - nL - nMin); -*/ long nUp = lcl_GetValue( aTopMF, eUnit ); long nMinHeight = (aOrigSize.Height() * 10) /11; nMin = nMinHeight - (nUp >= 0 ? nUp : 0); @@ -618,11 +605,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() long nLow = lcl_GetValue(aBottomMF, eUnit ); nMin = nMinHeight - (nLow >= 0 ? nLow : 0); aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); - - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; - aTopMF.SetMax(aPageSize.Height() - nLow - nMin); - aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/ } /*-------------------------------------------------------------------- Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, @@ -808,7 +790,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz ) Invalidate(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 0c306fbe051a..81d2b5dc337c 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -524,9 +524,6 @@ BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } } -//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; -//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW}; - if( bPositionModified ) { // Position diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 203e7ea1f585..9869aba5dcc1 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -328,7 +328,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); + //im Draw gibt es das Item als WhichId, im Writer nur als SlotId SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem); if(eState != SFX_ITEM_SET) @@ -402,11 +402,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -514,8 +509,6 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); - if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -573,11 +566,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -721,7 +709,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -850,10 +837,6 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -877,7 +860,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); // Grafiknamen ermitteln - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(USHORT i = 0; i < aGrfNames.Count(); i++) @@ -925,7 +907,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = FALSE; BOOL bIsPreset = FALSE; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -967,8 +948,6 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( !aGrfNames.Count() ) { -// das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } if( (bPreset || bModified) && pActNum) @@ -1356,7 +1335,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); USHORT nMask = 1; aLevelLB.SetUpdateMode(FALSE); aLevelLB.SetNoSelection(); @@ -1636,12 +1614,6 @@ void SvxNumOptionsTabPage::InitControls() aStartED.SetText(aEmptyStr); break; case SHOW_BULLET: - { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); - } break; case SHOW_BITMAP: break; @@ -1855,8 +1827,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetBulletChar( SVX_DEF_BULLET ); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); - //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont()); - //aBulletFT.SetText( aNumFmt.GetBulletChar() ); // Zuweisung der Zeichenvorlage automatisch if(bAutomaticCharStyles) { @@ -1867,7 +1837,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -1897,7 +1866,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aCharFmtLB.SelectEntry(sSelectStyle); CharFmtHdl_Impl(&aCharFmtLB); - // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt bAutomaticCharStyles = TRUE; } return 0; @@ -2005,7 +1973,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) Size aSize; sal_Bool bSucc(sal_False); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { @@ -2436,7 +2403,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); - // USHORT nFontHeight = nYStep * 6 / 10; if(bPosition) nFontHeight = nYStep * 15 / 10; @@ -3040,7 +3006,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, FALSE, &pItem)) nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue(); } - // if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, FALSE, &pItem)) { delete pSaveNum; diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index c4c9dde501f6..269847ee9b0a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -181,9 +181,6 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { -//! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! - SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = @@ -1003,8 +1000,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) 0x0002 --->EnableRegisterMode() 0x0004 --->EnableAutoFirstLine() 0x0008 --->EnableNegativeMode() - - */ SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); @@ -1710,7 +1705,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(FALSE); aPagenumText.Enable(FALSE); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1936,10 +1930,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )), aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )), aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )), -// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ), -// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ), -// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ), -// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), @@ -2319,17 +2309,10 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox) void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) { lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB ); -// lcl_SetBox(rSet, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); - //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(FALSE); -// aPuntuationCB .Enable(FALSE); -// aAdjustNumbersCB .Enable(FALSE); } IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox ) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index e9bde505a0da..1d3a8bdd2b26 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1167,32 +1167,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) else m_bAtVertPosModified = TRUE; - // OD 12.11.2003 #i22341# - following special handling no longer needed - /* - if (!bHori && m_pVMap == aVCharMap) - { - // Ausrichtung Vertikal - String sEntry; - USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB); - USHORT nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); - USHORT nRel = GetRelation(m_pVMap, m_aVertToLB); - - if (nRel == SwFPos::REL_CHAR) - sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM); - else - sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP); - - USHORT nOldPos = m_aVertLB.GetSelectEntryPos(); - - String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1); - if (sName != sEntry) - { - m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1); - m_aVertLB.InsertEntry(sEntry); - m_aVertLB.SelectEntryPos(nOldPos); - } - } - */ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung { if(bHori) diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 42e4a867b181..260281b03fdc 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -121,13 +121,11 @@ SvxLineTabDialog::SvxLineTabDialog AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0); AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0); -// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); -//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) ); } // ----------------------------------------------------------------------- @@ -279,18 +277,6 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxShadowTabPage&) rPage ).Construct(); } break; -/* - case RID_SVXPAGE_COLOR: - ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab ); - ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType ); - ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxColorTabPage&) rPage ).SetPos( &mnPos ); - ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP ); - ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState ); - ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable ); - ( (SvxColorTabPage&) rPage ).Construct(); - break; -*/ } } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3216a8cff824..14f9aefaff01 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -125,7 +125,6 @@ SvxBitmapTabPage::SvxBitmapTabPage // Setzen des Output-Devices rXFSet.Put( aXFStyleItem ); rXFSet.Put( aXBitmapItem ); - //aCtlPreview.SetAttributes( aXFillAttr ); aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) ); aBtnImport.SetClickHdl( @@ -357,14 +356,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //USHORT nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //BOOL bPixelColor = FALSE; - //USHORT nWidth = pBitmap->GetSizePixel().Width(); - //USHORT nHeight = pBitmap->GetSizePixel().Height(); - // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) { @@ -576,9 +567,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -647,7 +636,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -778,7 +766,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -798,7 +785,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbBitmaps.Invalidate(); } #endif diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 492802a80a17..2d534a3d9f23 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -115,9 +115,7 @@ SvxGradientTabPage::SvxGradientTabPage // Solange NICHT vom Item unterstuetzt - //aMtrColorTo.Disable(); aMtrColorTo.SetValue( 100 ); - //aMtrColorFrom.Disable(); aMtrColorFrom.SetValue( 100 ); // Setzen des Output-Devices @@ -312,9 +310,7 @@ long SvxGradientTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -484,7 +480,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -513,7 +508,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbGradients.Invalidate(); } #endif @@ -719,7 +713,6 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) else { LeaveWait(); - //aIStream.Close(); ErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 771ad92430e5..d01c7603f180 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -285,9 +285,7 @@ long SvxHatchTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -338,7 +336,6 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { - // aLbHatchings.SelectEntryPos( 0 ); ChangeHatchHdl_Impl( this ); // Status der Buttons ermitteln @@ -461,19 +458,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) default: aCtlAngle.SetActualRP( RP_MM ); break; } - // Backgroundcolor - /* - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), TRUE, &pPoolItem ) ) - { - rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) ); - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) ) - { - Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() ); - rXFSet.Put( XFillColorItem( String(), aColor ) ); - } - } - */ // ItemSet fuellen und an aCtlPreview weiterleiten rXFSet.Put( XFillHatchItem( String(), *pHatch ) ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); @@ -548,7 +532,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -572,7 +555,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbHatchings.Invalidate(); } #endif diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 4efa9f6db750..3bafde9e67ae 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -496,17 +496,7 @@ void DocumentHolder::InPlaceDeactivate(void) m_xLayoutManager->setVisible(false); if (NULL!=m_pIOleIPSite) - { - // The following workaround should let the object be stored in case of inplace editing -// CComPtr< IOleClientSite > pClientSite; -// -// m_pIOleIPSite->QueryInterface( -// IID_IOleClientSite, (void**)&pClientSite ); -// if ( pClientSite ) -// pClientSite->SaveObject(); - m_pIOleIPSite->OnInPlaceDeactivate(); - } if(m_pIOleIPFrame) m_pIOleIPFrame->Release(); m_pIOleIPFrame = 0; if(m_pIOleIPUIWindow) m_pIOleIPUIWindow->Release(); m_pIOleIPUIWindow = 0; @@ -1162,62 +1152,6 @@ IDispatch* DocumentHolder::GetIDispatch() return m_pIDispatch; } -#if 0 -HRESULT DocumentHolder::SetVisArea( const RECTL *pRect ) -{ - if ( pRect && m_xDocument.is() ) - { - uno::Sequence< beans::PropertyValue > aArgs = m_xDocument->getArgs(); - for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ ) - if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WinExtent" ) ) ) - { - // should allways be there - uno::Sequence< sal_Int32 > aRect(4); - - aRect[0] = pRect->left; - aRect[1] = pRect->top; - aRect[2] = pRect->right; - aRect[3] = pRect->bottom; - - aArgs[nInd].Value <<= aRect; - - m_xDocument->attachResource( m_xDocument->getURL(), aArgs ); - return S_OK; - } - - OSL_ENSURE( sal_False, "WinExtent seems not to be implemented!\n" ); - } - - return E_FAIL; -} - -HRESULT DocumentHolder::GetVisArea( RECTL *pRect ) -{ - if ( pRect && m_xDocument.is() ) - { - uno::Sequence< beans::PropertyValue > aArgs = m_xDocument->getArgs(); - for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ ) - if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WinExtent" ) ) ) - { - uno::Sequence< sal_Int32 > aRect; - if ( ( aArgs[nInd].Value >>= aRect ) && aRect.getLength() == 4 ) - { - pRect->left = aRect[0]; - pRect->top = aRect[1]; - pRect->right = aRect[2]; - pRect->bottom = aRect[3]; - - return S_OK; - } - - break; - } - } - - return E_FAIL; -} -#endif - HRESULT DocumentHolder::GetDocumentBorder( RECT *pRect ) { if ( pRect && m_xDocument.is() ) @@ -1589,52 +1523,6 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ ) } } - - -// if(m_pOLEInterface->GetGUID() == OID_WriterTextServer) { -// // edit group -// CopyToOLEMenu(m_nMenuHandle,1,hMenu,(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,2,hMenu,1+(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,3,hMenu,2+(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,4,hMenu,3+(WORD)mgw.width[0]); -// mgw.width[1]=4; - -// // object group -// CopyToOLEMenu( -// m_nMenuHandle,5, -// hMenu,4+(WORD)mgw.width[0]+(WORD)mgw.width[2]); -// mgw.width[3]=1; - -// // help group -// CopyToOLEMenu( -// m_nMenuHandle,7, -// hMenu,5+(WORD)mgw.width[0]+(WORD)mgw.width[2]+(WORD)mgw.width[4]); -// mgw.width[5]=1; -// } -// else if(m_pOLEInterface->GetGUID() == OID_CalcServer) { -// // edit group -// CopyToOLEMenu(m_nMenuHandle,1,hMenu,(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,2,hMenu,1+(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,3,hMenu,2+(WORD)mgw.width[0]); -// CopyToOLEMenu(m_nMenuHandle,4,hMenu,3+(WORD)mgw.width[0]); -// mgw.width[1]=4; - -// // object group -// CopyToOLEMenu( -// m_nMenuHandle,5, -// hMenu,4+(WORD)mgw.width[0]+(WORD)mgw.width[2]); -// CopyToOLEMenu( -// m_nMenuHandle,6, -// hMenu,5+(WORD)mgw.width[0]+(WORD)mgw.width[2]); -// mgw.width[3]=2; - -// // help group -// CopyToOLEMenu( -// m_nMenuHandle,8, -// hMenu,6+(WORD)mgw.width[0]+(WORD)mgw.width[2]+(WORD)mgw.width[4]); -// mgw.width[5]=1; -// } - // Fix strange warnings about some // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions. // warning C4505: 'xxx' : unreferenced local function has been removed diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 32ea696554f5..06ad62be62f1 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -203,19 +203,7 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler() if ( SUCCEEDED( hr ) ) { WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" ); -// // reinit the handler -// ComSmart< IRunnableObject > pIRunObj; -// hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj ); -// -// if ( SUCCEEDED( hr ) && pIRunObj ) { -// { -// ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem -// hr = pIRunObj->Run( NULL ); -// } -// -// if ( SUCCEEDED( hr ) ) - { if ( m_nInitMode == INIT_FROM_STORAGE ) { WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" ); @@ -247,7 +235,6 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler() hr = pPersistFile->Load( m_pFileName, m_nFileOpenMode ); } WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" ); - } } } @@ -1187,18 +1174,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unadvise( DWORD dwConnection ) STDMETHODIMP InprocEmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvise*/ ) { return E_NOTIMPL; - -// if ( CheckDefHandler() ) -// { -// ComSmart< IOleObject > pOleObject; -// HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject ); -// -// ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem -// if ( SUCCEEDED( hr ) && pOleObject ) -// return pOleObject->EnumAdvise( ppenumAdvise ); -// } -// -// return E_FAIL; } //------------------------------------------------------------------------------- diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 4eed6c7be1ca..15ab439f1739 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -68,9 +68,6 @@ namespace ole_adapter { #include <initguid.h> -// prior 5.2 ( src569 ver m) -// {3ECF78F0-B149-11D2-8EBE-00105AD848AF} -//DEFINE_GUID(OID_ServiceManager, 0x3ECF78F0, 0xB149, 0x11d2, 0x8E, 0xBE, 0x00, 0x10, 0x5A, 0xD8, 0x48, 0xAF); #ifndef OWNGUID // GUID used since 5.2 ( src569 m) diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index 06ee50cb8e0a..d38cc7c01ed2 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -82,7 +82,6 @@ public: { return _xContext; } virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( ::com::sun::star::uno::RuntimeException ) = 0; -// { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException ) diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 684644e47cec..71049b7702c5 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -1240,12 +1240,6 @@ HRESULT doTest() aAny <<= OUString( L" A string in an any"); aAny=invMfc->invoke( OUString(L"inVariant"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); - // Tests with Sequences later. - // OUString arStr4[]= {L"string0", L"string1", L"string2"}; - // Sequence<OUString> seqStr4( arStr4, 3); - // aAny <<= seqStr4; - // invMfc->invoke( OUString(L"inArray"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); - Reference < XInvocation > inv5= getComObject(L"AxTestComponents.Basic"); Any anyVal4; diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index eff03c8aedd4..14d6f0ffcd6a 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -280,29 +280,6 @@ public: // XTestSequence virtual Any SAL_CALL other_methodAny( const Any& rAny, const OUString& typeInAny ) throw (RuntimeException); - - // XTestOutParameters ------------------------------------------------------------------------ -// virtual void SAL_CALL out_test(sal_Int8 rIn) throw( RuntimeException ); - -// virtual void SAL_CALL out_methodByte(sal_Int8& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodFloat(float& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodDouble(double& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodBool(sal_Bool& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodShort(sal_Int16& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodUShort(sal_uInt16& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodLong(sal_Int32& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodULong(sal_uInt32& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodHyper(sal_Int64& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodString(OUString& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodChar(sal_Unicode& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodAny(Any& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException ); - // XTestInParameters virtual sal_Int8 SAL_CALL in_methodByte( sal_Int8 rIn ) throw (RuntimeException); virtual float SAL_CALL in_methodFloat( float rIn ) throw (RuntimeException); @@ -526,8 +503,7 @@ Sequence< Type > SAL_CALL OComponent::methodType(const Sequence< Type >& aSeq) t } return aSeq; } -//Sequence< Reference< XInterface> > SAL_CALL methodXInterface ( const Sequence< Reference < XInterface> >& aSeq) -// throw (RuntimeException) + Sequence< Reference< XInterface > > SAL_CALL OComponent::methodXInterface( const Sequence< Reference< XInterface > >& aSeq ) throw(RuntimeException) { for( sal_Int32 i= 0; i < aSeq.getLength(); i++) @@ -993,9 +969,6 @@ void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_ void SAL_CALL OComponent::testout_methodXInterface( Reference< XInterface >& rOut ) throw(RuntimeException) { rOut = m_xinterface; -// OUString string( L"Property Any"); -// m_any <<= string; -// rOut= Reference<XInterface> (static_cast<XTestSequence*>(this), UNO_QUERY); } // XTestInParameters ------------------------------------------------------------ @@ -1250,17 +1223,6 @@ void SAL_CALL OComponent::testinout_methodXInterface2( Reference< XInterface > & Reference<XInterface> tmp = rOut; rOut = m_xinterface; m_xinterface = tmp; -// Reference<XTestSequence> xTest( rOut, UNO_QUERY); -// if( xTest.is()) -// { -// Any any= xTest->getAttrAny2(); -// OUString _s; -// any >>= _s; -// OUString string= _s + OUString((L" this string was written in the UNO component to the inout pararmeter")); -// any <<= string; -// xTest->setAttrAny2( any); -// } - } Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException ) { @@ -1360,94 +1322,6 @@ Any SAL_CALL OComponent::other_methodAny( const Any& rAny, const OUString& typeI return rAny; } -// XTestOutParameters ============================================================================ -// void SAL_CALL OComponent::out_test(sal_Int8 rIn) throw( RuntimeException ) -// { -// } - -// void SAL_CALL OComponent::out_methodByte(sal_Int8& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } - -// void SAL_CALL OComponent::out_methodDouble(double& rOut) throw( RuntimeException ) -// { -// rOut= 3.14; -// } -// void SAL_CALL OComponent::out_methodFloat(float& rOut) throw( RuntimeException ) -// { -// rOut= 3.14; -// } -// void SAL_CALL OComponent::out_methodBool(sal_Bool& rOut) throw( RuntimeException ) -// { -// rOut= sal_True; -// } -// void SAL_CALL OComponent::out_methodShort(sal_Int16& rOut) throw( RuntimeException ) -// { -// rOut= -100; -// } -// void SAL_CALL OComponent::out_methodUShort(sal_uInt16& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } -// void SAL_CALL OComponent::out_methodLong(sal_Int32& rOut) throw( RuntimeException ) -// { -// rOut= -100; -// } - -// void SAL_CALL OComponent::out_methodULong(sal_uInt32& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } -// void SAL_CALL OComponent::out_methodHyper(sal_Int64& rOut) throw( RuntimeException ) -// { - -// } - -// void SAL_CALL OComponent::out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException ) -// { -// } - -// void SAL_CALL OComponent::out_methodString(OUString& rOut) throw( RuntimeException ) -// { -// rOut= L"I'm a string"; -// } -// void SAL_CALL OComponent::out_methodChar(sal_Unicode& rOut) throw( RuntimeException ) -// { -// rOut= 'A'; -// } -// void SAL_CALL OComponent::out_methodAny(Any& rOut) throw( RuntimeException) -// { -// Any a; -// a <<= OUString( L"Hi"); -// rOut= a; -// } -// void SAL_CALL OComponent::out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException ) -// { -// Sequence< sal_Int32 > aseq(10); -// for( sal_Int16 i= 0; i < aseq.getLength(); i++) aseq.getArray()[i]= i; -// rOut= aseq; -// } -// void SAL_CALL OComponent::out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException ) -// { -// rOut= Sequence< Sequence< sal_Int32 > >(); -// } -// void SAL_CALL OComponent::out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException ) -// { -// rout1= 111; -// rout2= 222; -// } -// void SAL_CALL OComponent::out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException ) -// { -// rout1= 111; -// rout2= 222; -// rout3= L"this is a neet little string"; -// } -// void SAL_CALL OComponent::out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException ) -// { -// sout= L"this is a neet little string"; -// } - // XTestInterfaces ------------------------------------------------------------------------------------- void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallback, sal_Int32 mode ) throw(RuntimeException) { @@ -1469,8 +1343,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac sal_Int8 aByte; sal_Int16 aShort; sal_Int32 aLong; -// sal_uInt16 aUShort; -// sal_uInt32 aULong; switch( mode) { @@ -1588,8 +1460,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac sal_Int8 aByte; sal_Int16 aShort; sal_Int32 aLong; -// sal_uInt16 aUShort; -// sal_uInt32 aULong; xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool, aChar, aString, aFloat, aDouble, @@ -1880,25 +1750,10 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback"); Reference<XInvocation> xInv( xIntCallback, UNO_QUERY); -//Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence<Any >& aParams,Sequence< sal_Int16 >& aOutParamIndex, -// Sequence<Any >& aOutParam ); Sequence<sal_Int16> seqIndizes; Sequence<Any> seqOutParams; xInv->invoke( OUString( L"outValuesAll"), Sequence<Any>(), seqIndizes, seqOutParams); -// void outValuesAll( [out] oletest::XSimple outInterface, -// [out] SimpleStruct outStruct , -// [out] SimpleEnum outEnum, -// [out] sequence<any> outSeqAny, -// [out] any outAny, -// [out] boolean outBool, -// [out] char outChar, -// [out] string outString, -// [out] float outFloat, -// [out] double outDouble, -// [out] byte outByte, -// [out] short outShort, -// [out] long outLong); if( seqOutParams.getLength() == 12) { Reference<XSimple> xSimple= *(XSimple**)seqOutParams[0].getValue(); @@ -2026,8 +1881,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac break; } case 303: - // in parameter -// void inValues( [in] char aChar, [in] long aLong, [in] string aString); { Reference<XInterface> xIntFact = m_rFactory->createInstance( L"com.sun.star.bridge.oleautomation.Factory"); @@ -2082,7 +1935,6 @@ sal_Bool SAL_CALL OComponent::isSame( const Reference< XInterface >& val ) throw Reference< XInterface > SAL_CALL OComponent::getThis( ) throw (RuntimeException) { -// return Reference<XInterface>(static_cast<XIdentity*>(this), UNO_QUERY); Reference<XInterface> ret(static_cast<XIdentity*>(this), UNO_QUERY); return ret; } diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx index fa3e39271365..35ccd1ab1005 100644 --- a/extensions/test/ole/unloading/unloadTest.cxx +++ b/extensions/test/ole/unloading/unloadTest.cxx @@ -171,18 +171,6 @@ sal_Bool test3() Reference<XComponent> xcomp( context, UNO_QUERY); xcomp->dispose(); -// for (int i=0; i < 10; i++) -// { -// Reference<XSimpleRegistry> xreg= createSimpleRegistry(); -// xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), -// sal_False, sal_False ); -// Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); -// Reference<XComponent> xcomp( context, UNO_QUERY); -// xcomp->dispose(); -// -// } - -// return sal_True; return bTest1 && bTest2; } diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 508c05ac5ca1..ef09d4841148 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -94,7 +94,6 @@ namespace frm ,m_pPropertyArrayHelper( NULL ) ,m_bDisposed( false ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::PropertyBagHelper" ); } //-------------------------------------------------------------------- @@ -106,14 +105,12 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::dispose() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::dispose" ); m_bDisposed = true; } //-------------------------------------------------------------------- void PropertyBagHelper::impl_nts_checkDisposed_throw() const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_nts_checkDisposed_throw" ); if ( m_bDisposed ) throw DisposedException(); } @@ -121,14 +118,12 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::impl_nts_invalidatePropertySetInfo() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_nts_invalidatePropertySetInfo" ); delete m_pPropertyArrayHelper, m_pPropertyArrayHelper = NULL; } //-------------------------------------------------------------------- sal_Int32 PropertyBagHelper::impl_findFreeHandle( const ::rtl::OUString& _rPropertyName ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_findFreeHandle" ); ::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() ); // check the preferred handle @@ -168,8 +163,6 @@ namespace frm //-------------------------------------------------------------------- ::comphelper::OPropertyArrayAggregationHelper& PropertyBagHelper::impl_ts_getArrayHelper() const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_ts_getArrayHelper" ); - //::osl::MutexGuard aGuard( m_rContext.getMutex() ); OPropertyArrayAggregationHelper* p = m_pPropertyArrayHelper; if ( !p ) { @@ -204,7 +197,6 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::addProperty" ); ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); @@ -232,7 +224,6 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::removeProperty( const ::rtl::OUString& _rName ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::removeProperty" ); ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); @@ -281,7 +272,6 @@ namespace frm //-------------------------------------------------------------------- Sequence< PropertyValue > PropertyBagHelper::getPropertyValues() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::getPropertyValues" ); ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); @@ -324,7 +314,6 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::setPropertyValues" ); ::osl::ClearableMutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 877baab5e1c6..26074f2a1c6f 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -234,60 +234,12 @@ void Model::dbg_assertInvariant() const { OSL_ENSURE( mpInstances != NULL, "no instances found" ); OSL_ENSURE( mxInstances.is(), "No instance container!" ); - // OSL_ENSURE( mxInstances->hasElements(), "no instance!" ); OSL_ENSURE( mpBindings != NULL, "no bindings element" ); OSL_ENSURE( mxBindings.is(), "No Bindings container" ); OSL_ENSURE( mpSubmissions != NULL, "no submissions element" ); OSL_ENSURE( mxSubmissions.is(), "No Submission container" ); - - - - /* - // check bindings, and things that have to do with our binding - std::vector<MIP*> aAllMIPs; // check MIP map - sal_Int32 nCount = mpBindings->countItems(); - for( sal_Int32 i = 0; i < nCount; i++ ) - { - Binding* pBind = Binding::getBinding( - mpBindings->Collection<XPropertySet_t>::getItem( i ) ); - - // examine and check binding - OSL_ENSURE( pBind != NULL, "invalid binding found" ); - - OSL_ENSURE( Model::getModel( pBind->getModel() ) == this, - "our binding doesn't know us."); - // check this binding's MIP against MIP map - MIP* pMIP = const_cast<MIP*>( pBind->_getMIP() ); - sal_Int32 nFound = 0; - if( pMIP != NULL ) - { - aAllMIPs.push_back( pMIP ); - for( MIPs_t::const_iterator aIter = maMIPs.begin(); - aIter != maMIPs.end(); - aIter++ ) - { - if( pMIP == aIter->second ) - nFound++; - } - } - OSL_ENSURE( ( pMIP == NULL ) == ( nFound == 0 ), "MIP-map wrong" ); - } - - // check MIP map for left-over MIPs - for( MIPs_t::const_iterator aIter = maMIPs.begin(); - aIter != maMIPs.end(); - aIter++ ) - { - MIP* pMIP = aIter->second; - std::vector<MIP*>::iterator aFound = - std::find( aAllMIPs.begin(), aAllMIPs.end(), pMIP ); - if( aFound != aAllMIPs.end() ) - aAllMIPs.erase( aFound ); - } - OSL_ENSURE( aAllMIPs.empty(), "lonely MIPs found!" ); - */ } #endif @@ -325,8 +277,6 @@ void Model::removeMIPs( void* pTag ) MIP Model::queryMIP( const XNode_t& xNode ) const { - // OSL_ENSURE( xNode.is(), "no node" ); - // travel up inheritance chain and inherit MIPs MIP aRet; for( XNode_t xCurrent = xNode; @@ -717,15 +667,6 @@ Model::XSet_t Model::getSubmissions() return mxSubmissions; } - - -// -// implementation of XFormsUIHelper1 interface -// can be found in file model_ui.cxx -// - - - // // implement XPropertySet & friends // diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index c3e2ab545668..f7262c527045 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.cxx @@ -96,17 +96,6 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X } } -/* -void -CSerializationAppXML::serialize_nodeset() -{ - CSS::uno::Reference< CSS::xml::dom::XNodeList > aNodeList = m_aXPathObject->getNodeList(); - for (sal_Int32 i=0; i<aNodeList->getLength(); i++) - serialize_node(aNodeList->item(i)); - m_aPipe->closeOutput(); -} -*/ - void CSerializationAppXML::serialize() { diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index e5ab54533e61..b0f498ff1b96 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -170,23 +170,7 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode) if (aChild.is() && aChild->getNodeType() == NodeType_ELEMENT_NODE) serialize_node(aChild); } - - // siblings... -// Reference< XNode > aSibling = aNode->getNextSibling(); -// if (aSibling.is()) -// serialize_node(aSibling); - -} - -/* -void CSerializationURLEncoded::serialize_nodeset() -{ - Reference< XNodeList > aNodeList = m_aXPathObject->getNodeList(); - for (sal_Int32 i=0; i<aNodeList->getLength(); i++) - serialize_node(aNodeList->item(i)); - m_aPipe->closeOutput(); } -*/ void CSerializationURLEncoded::serialize() { diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index c76d492873d9..114b2518afd1 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -66,7 +66,6 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment); // use post command - OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post")); PostCommandArgument2 aPostArgument; aPostArgument.Source = apSerialization->getInputStream(); @@ -78,26 +77,17 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< aCommandArgument <<= aPostArgument; aContent.executeCommand( aCommandName, aCommandArgument); - // wait for command to finish - // pProgressHelper->m_cFinished.wait(); - - // CSS::uno::Reference< XOutputStream > xOut(aSink, UNO_QUERY_THROW); - // xOut->closeOutput(); - try { - // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW); m_aResultStream = aSink->getInputStream(); } catch (Exception&) { OSL_ENSURE(sal_False, "Cannot open reply stream from content"); } } catch (Exception&) { - // XXX OSL_ENSURE(sal_False, "Exception during UCB operatration."); return UNKNOWN_ERROR; } - return SUCCESS; } diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 7687b2b182ef..d2b92ba733b3 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -81,8 +81,6 @@ using namespace linguistic; #define CAPTYPE_MIXED 4 // min, max - -//#define Min(a,b) (a < b ? a : b) #define Max(a,b) (a > b ? a : b) /////////////////////////////////////////////////////////////////////////// @@ -208,12 +206,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() // add dictionary information aDicts = new HDInfo[numdict]; -/* - aTEncs = new rtl_TextEncoding [numdict]; - aTLocs = new Locale [numdict]; - aTNames = new OUString [numdict]; - aCharSetInfo = new CharClass* [numdict]; -*/ + k = 0; for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt) { @@ -626,7 +619,6 @@ Reference< XPossibleHyphens > SAL_CALL int n = wordlen-1; while((n >=0) && (lcword[n] == '.')) n--; n++; - // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr); if (n > 0) { if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut, minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))), @@ -650,7 +642,6 @@ Reference< XPossibleHyphens > SAL_CALL // now backfill hyphens[] for any removed periods for (int c = n; c < wordlen; c++) hyphens[c] = '0'; hyphens[wordlen] = '\0'; - // fprintf(stderr,"... %s\n",hyphens); fflush(stderr); INT16 nHyphCount = 0; INT16 i; @@ -676,8 +667,6 @@ Reference< XPossibleHyphens > SAL_CALL } hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear(); - //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord)); - //fflush(stderr); xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos ); diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 0efe7eebf200..f34b2676762c 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -66,7 +66,6 @@ namespace css = ::com::sun::star; #define A2OU(x) ::rtl::OUString::createFromAscii( x ) #define SERVICENAME "com.sun.star.linguistic2.LanguageGuessing" - #define IMPLNAME "com.sun.star.lingu2.LanguageGuessing" static Sequence< OUString > getSupportedServiceNames_LangGuess_Impl() @@ -191,40 +190,6 @@ void LangGuess_Impl::EnsureInitialized() //************************************************************************* -/* TL: currently not part of the API -Sequence< com::sun::star::lang::Locale > SAL_CALL LangGuess_Impl::guessLanguages( - const rtl::OUString &rText, - sal_Int32 nStartPos, - sal_Int32 nLen ) - throw (RuntimeException) -{ - Sequence< com::sun::star::lang::Locale > aRes; - - OString o = OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ); - vector<Guess> gs = m_aGuesser.GuessLanguage(o.pData->buffer); - - aRes.realloc(gs.size()); - - com::sun::star::lang::Locale *pRes = aRes.getArray(); - -#ifdef DEBUG - std::cout << " We have " << gs.size() << " candidates" << std::endl; -#endif - - for(int i = 0; i < gs.size() ; i++ ){ - com::sun::star::lang::Locale current_aRes; - - current_aRes.Language = A2OU( gs[i].getLanguage().c_str() ); - current_aRes.Country = A2OU( gs[i].getCountry().c_str() ); - - pRes[i] = current_aRes; - } - - return aRes; -} -*/ -//************************************************************************* - Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( const ::rtl::OUString& rText, ::sal_Int32 nStartPos, @@ -262,8 +227,6 @@ void LangGuess_Impl::SetFingerPrintsDB( OString conf_file_path(path); conf_file_path += conf_file_name; - //cout << "Conf file : " << conf_file_path.getStr() << " directory : " << path.getStr() << endl; - m_aGuesser.SetDBPath((const char*)conf_file_path.getStr(), (const char*)path.getStr()); } diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx index f9392cf379bd..b2bd3de4211c 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx @@ -93,7 +93,6 @@ const sal_Char *dbg_dump(rtl_uString *pStr) MacSpellChecker::MacSpellChecker() : aEvtListeners ( GetLinguMutex() ) { -// aDicts = NULL; aDEncs = NULL; aDLocs = NULL; aDNames = NULL; @@ -110,14 +109,6 @@ MacSpellChecker::MacSpellChecker() : MacSpellChecker::~MacSpellChecker() { - // if (aDicts) { - // for (int i = 0; i < numdict; i++) { - // if (aDicts[i]) delete aDicts[i]; - // aDicts[i] = NULL; - // } - // delete[] aDicts; - // } - // aDicts = NULL; numdict = 0; if (aDEncs) delete[] aDEncs; aDEncs = NULL; @@ -162,7 +153,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8; std::vector<objc_object *> postspdict; - //std::vector<dictentry *> postspdict; std::vector<dictentry *> postupdict; @@ -224,11 +214,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() numlocs++; } aDLocs[k] = nLoc; - //pointer to Hunspell dictionary - not needed for MAC - //aDicts[k] = NULL; aDEncs[k] = 0; - // Dictionary file names not valid for Mac Spell - //aDNames[k] = aPathOpt.GetLinguisticPath() + A2OU("/ooo/") + A2OU(postspdict[i]->filename); k++; } @@ -237,7 +223,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() } else { /* no dictionary.lst found so register no dictionaries */ numdict = 0; - //aDicts = NULL; aDEncs = NULL; aDLocs = NULL; aDNames = NULL; diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index 2ef10553e239..db7fbeb3e5fc 100644 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -285,18 +285,6 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi if (hdl == INVALID_HANDLE_VALUE) { fSuccess = MoveFileExImpl( sFileName2.c_str(), sFileName1.c_str(), MOVEFILE_REPLACE_EXISTING ); - - // if ( fSuccess ) - // { - // mystr = "Success"; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); - // } - // else - // { - // char buff[256]; - // wsprintf(buff, "Failure %d", GetLastError()); - // MessageBox( NULL, buff, "Titel", MB_OK ); - // } } else { @@ -554,17 +542,11 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) OutputDebugStringA( "Starting Custom Action" ); - // std::_tstring mystr; - // mystr = "Patchfile: " + sPatchFile; - // MessageBox( NULL, mystr.c_str(), "Patchfile", MB_OK ); - aSectionNames = getProfileSections( sPatchFile ); while ( !aSectionNames.empty() ) { std::_tstring sSectionName = aSectionNames.front(); if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); } - // mystr = "Section: " + sSectionName; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); aKeyNames = getProfileKeys( sPatchFile, sSectionName ); while ( !aKeyNames.empty() ) @@ -584,9 +566,6 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) sFileName1 = sInstDir + sSectionName + sFileName1; sFileName2 = sFileName1 + sExtension; - // mystr = "Convert: " + sFileName1 + " to " + sFileName2; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); - SwapFiles( sFileName1, sFileName2 ); } @@ -634,17 +613,11 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) std::queue< std::_tstring > aSectionNames; std::queue< std::_tstring > aKeyNames; - // std::_tstring mystr; - // mystr = "Patchfile: " + sPatchFile; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); - aSectionNames = getProfileSections( sPatchFile ); while ( !aSectionNames.empty() ) { std::_tstring sSectionName = aSectionNames.front(); if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); } - // mystr = "Section: " + sSectionName; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); aKeyNames = getProfileKeys( sPatchFile, sSectionName ); while( !aKeyNames.empty() ) @@ -664,9 +637,6 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) sFileName1 = sInstDir + sSectionName + sFileName1; sFileName2 = sFileName1 + sExtension; - // mystr = "Convert: " + sFileName1 + " to " + sFileName2; - // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); - SwapFiles( sFileName2, sFileName1 ); } @@ -726,7 +696,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) // 1. Reading Product Code from setup.ini of installed Office std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); - // MessageBox(NULL, sInstallPath.c_str(), "INSTALLLOCATION", MB_OK); std::_tstring sSetupiniPath = sInstallPath + TEXT("program\\setup.ini"); TCHAR szProductCode[32767]; @@ -743,7 +712,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) if ( !_tcsicmp( szProductCode, TEXT("NOTFOUND") ) ) { // No setup.ini or no "ProductCode" in setup.ini. This is an invalid directory. - // MessageBox(NULL, "NOTFOUND set", "DEBUG", MB_OK); return ERROR_SUCCESS; } @@ -752,7 +720,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) std::_tstring productCode = TEXT(szProductCode); productCode = ConvertGuid(std::_tstring(productCode.c_str() + 1, productCode.length() - 2)); mystr = TEXT("Changed product code: ") + productCode; - // MessageBox(NULL, mystr.c_str(), "ProductCode", MB_OK); // 3. Setting path in the Windows registry to find installed features @@ -764,14 +731,12 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) registryRoot = HKEY_LOCAL_MACHINE; registryKey = TEXT("Software\\Classes\\Installer\\Features\\") + productCode; mystr = registryKey; - // MessageBox( NULL, mystr.c_str(), "ALLUSERS", MB_OK ); } else { registryRoot = HKEY_CURRENT_USER; registryKey = TEXT("Software\\Microsoft\\Installer\\Features\\") + productCode; mystr = registryKey; - // MessageBox( NULL, mystr.c_str(), "ALLUSERS", MB_OK ); } // 4. Collecting all installed features from Windows registry @@ -780,7 +745,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) if (RegOpenKey(registryRoot, registryKey.c_str(), &hKey) == ERROR_SUCCESS) { int counter = 0; - // DWORD counter = 0; LONG lEnumResult; do @@ -798,11 +762,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) std::_tstring sValueName = szValueName; std::_tstring sValueData = szValueData; - // mystr = sValueName; - // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK ); - // mystr = sValueData; - // MessageBox( NULL, mystr.c_str(), "ValueData", MB_OK ); - // Does this feature exist in this patch? if ( IsSetMsiProperty(handle, sValueName) ) { @@ -810,14 +769,10 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) if ( 6 == szValueData[0] ) { MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_ABSENT); // do not install this feature - // mystr = TEXT("Do NOT install: ") + sValueName; - // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK ); } else { MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_LOCAL); // do install this feature - // mystr = TEXT("Do install: ") + sValueName; - // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK ); } } } @@ -842,14 +797,10 @@ extern "C" UINT __stdcall SetNewFeatureState( MSIHANDLE handle ) if (IsSetMsiProperty(handle, TEXT("SELECT_OU_FEATURE"))) { MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_LOCAL); // do install this feature - // mystr = TEXT("OnlineUpdate wird installiert!"); - // MessageBox(NULL, mystr.c_str(), "INSTALLSTATE_LOCAL", MB_OK); } else { MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_ABSENT); // do not install this feature - // mystr = TEXT("OnlineUpdate wird NICHT installiert!"); - // MessageBox(NULL, mystr.c_str(), "INSTALLSTATE_ABSENT", MB_OK); } return ERROR_SUCCESS; @@ -869,10 +820,6 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle ) HANDLE hdl = FindFirstFile(sSearchFile.c_str(), &data); if (hdl != INVALID_HANDLE_VALUE) // the file exists { - // std::_tstring mystr; - // mystr = "Found file: " + sSearchFile; - // MessageBox( NULL, mystr.c_str(), "Found file", MB_OK ); - // And finally setting property SHOW_ONLINEUPDATE_DIALOG // to hide this dialog UnsetMsiProperty(handle, TEXT("SHOW_ONLINEUPDATE_DIALOG")); @@ -886,10 +833,6 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle ) } else { - // std::_tstring mystr; - // mystr = "Did not find file: " + sSearchFile; - // MessageBox( NULL, mystr.c_str(), "File not found", MB_OK ); - // If the file does not exist, the Online Update dialog // has to be shown. SetMsiProperty(handle, TEXT("SHOW_ONLINEUPDATE_DIALOG")); diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx index 11c9757ff921..56885d408b77 100644 --- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx +++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx @@ -117,11 +117,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) stripFinalBackslash(&sBasisInstallPath); stripFinalBackslash(&sUreInstallPath); - // string myText1 = TEXT("Creating Basis-Link: ") + sBasisLinkPath; - // string myText2 = TEXT("Creating Ure-Link: ") + sUreLinkPath; - // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK); - // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK); - // creating basis-link in brand layer HANDLE h1file = CreateFile( @@ -151,7 +146,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) LPSTR lpPathUTF8 = new CHAR[nCharsRequired]; WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL ); - // WriteFile( h1file, sBasisInstallPath.c_str(), sBasisInstallPath.size() ,&dummy, 0 ); WriteFile( h1file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 ); delete lpPathUTF8; @@ -193,7 +187,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) LPSTR lpPathUTF8 = new CHAR[nCharsRequired]; WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL ); - // WriteFile( h2file, sUreInstallPath.c_str(), sUreInstallPath.size() ,&dummy, 0 ); WriteFile( h2file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 ); delete lpPathUTF8; @@ -221,12 +214,7 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle) string sUreLinkPath = sBasisInstallPath + TEXT("ure-link"); string sUreDirName = sUreInstallPath + TEXT("bin"); - // string myText2 = TEXT("Deleting Ure-Link: ") + sUreLinkPath; - // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK); - // Deleting link to basis layer - // string myText1 = TEXT("Deleting Basis-Link: ") + sBasisLinkPath; - // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK); DeleteFile(sBasisLinkPath.c_str()); // Check, if URE is still installed @@ -236,22 +224,10 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle) if ( hFindContent == INVALID_HANDLE_VALUE ) { ureDirExists = false; } FindClose( hFindContent ); - // if ( ureDirExists ) - // { - // string myText3 = TEXT("URE directory still exists: ") + sUreDirName; - // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK); - // string myText4 = TEXT("URE link NOT removed: ") + sUreLinkPath; - // MessageBox(NULL, myText4.c_str(), "DEBUG", MB_OK); - // } - // Deleting link to URE layer, if URE dir no longer exists if ( ! ureDirExists ) { - // string myText5 = TEXT("URE directory does not exist: ") + sUreDirName; - // MessageBox(NULL, myText5.c_str(), "DEBUG", MB_OK); DeleteFile(sUreLinkPath.c_str()); - // string myText6 = TEXT("URE link removed: ") + sUreLinkPath; - // MessageBox(NULL, myText6.c_str(), "DEBUG", MB_OK); } return ERROR_SUCCESS; diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index 9c5e6d4eb416..6b8a85eb163f 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -76,9 +76,6 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) { std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") ); std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini"); - - // MessageBox(NULL, sDesktopFile.c_str(), TEXT("OfficeMenuFolder"), MB_OK | MB_ICONINFORMATION); - std::_tstring sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe"); OSVERSIONINFO osverinfo; @@ -114,14 +111,6 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) TEXT("0"), sDesktopFile.c_str() ); - /* - WritePrivateProfileString( - TEXT(".ShellClassInfo"), - TEXT("InfoTip"), - TEXT("StarOffice Productivity Suite"), - sDesktopFile.c_str() ); - */ - SetFileAttributes( sDesktopFile.c_str(), FILE_ATTRIBUTE_HIDDEN ); SetFileAttributes( sOfficeMenuFolder.c_str(), FILE_ATTRIBUTE_SYSTEM ); diff --git a/setup_native/source/win32/stwrapper/stwrapper.cxx b/setup_native/source/win32/stwrapper/stwrapper.cxx index b4e22cf7afca..2376c94bf952 100644 --- a/setup_native/source/win32/stwrapper/stwrapper.cxx +++ b/setup_native/source/win32/stwrapper/stwrapper.cxx @@ -390,7 +390,6 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int ) if ( dwSTClientExitCode == ERR_NO_RECORDS_FOUND ) { - // output=`${STCLIENT} -a [-i "${INSTANCE_URN}"] -p "${PRODUCT_NAME}" -e "${PRODUCT_VERSION}" -t "${TARGET_URN}" -S "${PRODUCT_SOURCE}" -P "${PARENT_PRODUCT_NAME}" -m "Sun Microsystems, Inc." -A ${uname} -z global` lpCommandLine = new TCHAR[MAXCMDLINELEN]; _tcscpy( lpCommandLine, TEXT( "\"" )); diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx index d8ec2db95384..09c2365bb642 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx @@ -62,7 +62,6 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLSignature_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_MSCryptImpl::impl_getImplementationName() ; @@ -124,10 +123,6 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* } return sal_True; - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; } diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index c71adbbe20d5..93beee5ba058 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -206,9 +206,6 @@ Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl :: impl_createInsta } Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) { - //Reference< XSingleServiceFactory > xFactory ; - //xFactory = ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName , impl_createInstance , impl_getSupportedServiceNames ) ; - //return xFactory ; return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ; } @@ -794,7 +791,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, int ncvinCount=0; #if ( NSS_VMAJOR > 3 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR > 12 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH > 0 ) - // cert_pi_useAIACertFetch was added in NSS 3.12.1 cvin[ncvinCount].type = cert_pi_useAIACertFetch; cvin[ncvinCount].value.scalar.b = PR_TRUE; ncvinCount++; @@ -828,7 +824,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, rev.leafTests.preferred_methods = NULL; rev.leafTests.cert_rev_method_independent_flags = CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST; -// | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE; rev.chainTests.number_of_defined_methods = 2; rev.chainTests.cert_rev_flags_per_method = revFlagsChain; @@ -842,7 +837,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, rev.chainTests.preferred_methods = NULL; rev.chainTests.cert_rev_method_independent_flags = CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST; -// | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE; cvin[ncvinCount].type = cert_pi_revocationFlags; diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index f661d7e8decf..40051977b560 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -62,7 +62,6 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLSignature_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_NssImpl::impl_getImplementationName() ; @@ -124,10 +123,6 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe } return sal_True; - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; } diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 7384c6f310a7..6b09fea26718 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -432,21 +432,6 @@ void SAXHelper::setDocumentLocator( const cssu::Reference< cssxs::XLocator > &) throw( cssxs::SAXException , cssu::RuntimeException ) { - //--Pseudo code if necessary - //--m_pSaxLocator is a member defined as xmlSAXHabdlerPtr - //--m_pSaxLocatorHdl is a member defined as Sax_Locator - - //if( m_pSaxLocator != NULL ) { - // //Deallocate the memory - //} - //if( m_pSaxLocatorHdl != NULL ) { - // //Deallocate the memory - //} - - //m_pSaxLocatorHdl = new Sax_Locator( xLocator ) ; - //m_pSaxLocator = { m_pSaxLocatorHdl->getPublicId , m_pSaxLocatorHdl->getSystemId , m_pSaxLocatorHdl->getLineNumber , m_pSaxLocatorHdl->getColumnNumber } ; - - //m_pSaxHandler->setDocumentLocator( m_pParserCtxt , m_pSaxLocator ) ; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index cfac243a851c..a0320d59ce48 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -121,7 +121,6 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLElementWrapper_XmlSecImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ; @@ -169,11 +168,6 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe if( !result ) return sal_False ; #endif - - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; |