diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2011-03-28 12:38:06 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-03-28 12:38:32 +0200 |
| commit | 40fe03745fc75609350cf8115134eb07f04eefa7 (patch) | |
| tree | 75513da6fca2216ac0b7c29ccf14d56b1786363a /sfx2 | |
| parent | 5373c145a2003d8b45eb9228cc6bbfd0de36fed8 (diff) | |
Remove commented code in libs-core/sfx2
Diffstat (limited to 'sfx2')
67 files changed, 6 insertions, 299 deletions
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 9837720377c0..79f08172a621 100755 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -129,28 +129,6 @@ public: //is apparently used only in SfxPickList/SfxFrameLoader DECL_OBJHINT( SfxStringHint, String ); -/* -typedef SfxPoolItem* (*SfxItemCreateFunc)(); -class SfxItemFactory_Impl; -class SfxItemFactoryList -{ - List aList; -public: - ~SfxItemFactoryList(); - - SfxItemFactory_Impl* GetFactory_Impl( const SvGlobalName& rName ) const; - SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const; - const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const; - SfxPoolItem* Create( - const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const; - void RegisterItemFactory( - const SvGlobalName& rName, SfxItemCreateFunc ); -}; - -#define REGISTER_ITEM( ItemClass, aGlobName ) \ -RegisterItemFactory( aGlobName, ( SfxItemCreateFunc) ItemClass::StaticType() ); -*/ - #ifndef SFX_DECL_OBJECTSHELL_DEFINED #define SFX_DECL_OBJECTSHELL_DEFINED SV_DECL_REF(SfxObjectShell) diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 3327c2afeb49..428e4865aa9c 100755 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -214,8 +214,6 @@ private: HelpButton* pHelpBtn; SingleTabDlgImpl* pImpl; -// const SfxItemSet* pOptions; -// SfxItemSet* pOutSet; DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); }; diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 3760c1d30be9..13e92d9ff150 100755 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -230,7 +230,6 @@ public: SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&); SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis ); SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* ); - //SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void Activate_Impl(); SAL_DLLPRIVATE void Deactivate_Impl(); diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index 21c6c27609d8..165c7020850b 100755 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -103,8 +103,6 @@ public: SfxFilterContainer( const String& rName ); ~SfxFilterContainer(); -// SfxFilterContainerFlags GetFlags() const; -// void SetFlags( SfxFilterContainerFlags eFlags ); const String GetName() const; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 51305f9a2766..fb5f232dddd7 100755 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -281,9 +281,6 @@ public: UniString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - //virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - //virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - //virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxFrameProperties& GetProperties() const { return aProperties; } diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx index bdcddc500ddb..a441acad6b2e 100755 --- a/sfx2/inc/sfx2/ipclient.hxx +++ b/sfx2/inc/sfx2/ipclient.hxx @@ -99,9 +99,6 @@ public: void ResetObject(); sal_Bool IsUIActive(); - // used in Writer - // Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const; - // Rectangle LogicObjAreaToPixel( const Rectangle & rRect ) const; virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning) }; diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx index 1ca48d8d8635..7808de9d32f8 100755 --- a/sfx2/inc/sfx2/itemconnect.hxx +++ b/sfx2/inc/sfx2/itemconnect.hxx @@ -49,8 +49,6 @@ const ItemConnFlags ITEMCONN_NONE = 0x0000; /** Connection is inactive - virtual functions will not be called. */ const ItemConnFlags ITEMCONN_INACTIVE = 0x0001; -/** Clone item in FillItemSet() from old item set. */ -//const ItemConnFlags ITEMCONN_CLONE_ITEM = 0x0002; /** Enable control(s), if the item is known. */ const ItemConnFlags ITEMCONN_ENABLE_KNOWN = 0x0010; diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index 38fb912dc2c6..48273cdea55c 100755 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -37,7 +37,6 @@ class SfxViewShell; -//class SfxProgress; struct SfxPrintProgress_Impl; // ------------------------------------------------------------------------ diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx index 93f5611a287f..255e4298fd17 100755 --- a/sfx2/inc/sfx2/securitypage.hxx +++ b/sfx2/inc/sfx2/securitypage.hxx @@ -34,7 +34,6 @@ #include <memory> -////////////////////////////////////////////////////////////////////// struct SfxSecurityPage_Impl; @@ -53,7 +52,6 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); }; -////////////////////////////////////////////////////////////////////// #endif // #ifndef _SECURITYPAGE_HXX_ diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index b1ab1b879c98..5bc6812082bd 100755 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -54,8 +54,6 @@ class TransferableDataHelper; struct TransferableObjectDescriptor; #include <sfx2/tabdlg.hxx> -//typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -//typedef sal_uInt16* (*GetTabPageRanges)(); namespace sfx2 { diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 3051f3ed188f..858dafb657a9 100755 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -178,7 +178,6 @@ public: }; //------------------------------------------------------------------ -//------------------------------------------------------------------ #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index f450e0108690..3c3f1472be8d 100755 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -196,7 +196,6 @@ public: sal_Bool IsInModalMode() const; void Resize(sal_Bool bForce=sal_False); - //void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible ); void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True); void ToggleChildWindow(sal_uInt16); sal_Bool HasChildWindow(sal_uInt16); diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java index d145b9028473..8f7071048fc3 100755 --- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java +++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -127,10 +127,6 @@ public class DocumentMetadataAccess XRepositorySupplier xRS; XDocumentMetadataAccess xDMA; -// public String[] getTestMethodNames () -// { -// return new String[] { "check", "checkRDFa" }; -// } /** * The test parameters */ @@ -522,11 +518,6 @@ public class DocumentMetadataAccess PropertyValue file = new PropertyValue(); file.Name = "URL"; file.Value = tempDir + "TESTDMA.odt"; - /* - PropertyValue baseURL = new PropertyValue(); - baseURL.Name = "DocumentBaseURL"; - baseURL.Value = tempDir + "TMP.odt"; - */ PropertyValue mimetype = new PropertyValue(); mimetype.Name = "MediaType"; mimetype.Value = "application/vnd.oasis.opendocument.text"; @@ -960,39 +951,14 @@ public class DocumentMetadataAccess return blank != null; } -/* - static class Statement implements XStatement - { - XResource m_Subject; - XResource m_Predicate; - XNode m_Object; - XURI m_Graph; - - Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, - XURI i_Graph) - { - m_Subject = i_Subject; - m_Predicate = i_Predicate; - m_Object = i_Object; - m_Graph = i_Graph; - } - - public XResource getSubject() { return m_Subject; } - public XResource getPredicate() { return m_Predicate; } - public XNode getObject() { return m_Object; } - public XURI getGraph() { return m_Graph; } - } -*/ static Statement[] toSeq(XEnumeration i_Enum) throws Exception { java.util.Collection c = new java.util.Vector(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); -//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } -// return (Statement[]) c.toArray(); // java sucks Object[] arr = c.toArray(); Statement[] ret = new Statement[arr.length]; @@ -1009,7 +975,6 @@ public class DocumentMetadataAccess XNode[] s = (XNode[]) i_Enum.nextElement(); c.add(s); } -// return (XNode[][]) c.toArray(); Object[] arr = c.toArray(); XNode[][] ret = new XNode[arr.length][]; for (int i = 0; i < arr.length; ++i) { diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java index 4767028572bb..b604bd010d65 100755 --- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java +++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java @@ -194,8 +194,6 @@ public class WriterHelper { xRoot = AccessibilityTools.getAccessibleObject(xWindow); - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); try { diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 97dd00a73367..f11578805e4d 100755 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -324,16 +324,6 @@ ToolBox RID_HELPBAR { Identifier = SID_HELP_ANNOTATE ; }; - /* - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_HELP_DOWNLOAD ; - }; -*/ }; }; @@ -417,7 +407,6 @@ WarningBox RID_SECURITY_WARNING_HYPERLINK WarningBox RID_SECURITY_WARNING_NO_HYPERLINKS { - //HelpId = HID_WARNING_SECURITY_NO_HYPERLINKS; Buttons = WB_OK ; DefButton = WB_DEF_OK ; Message [ en-US ] = "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened."; @@ -435,7 +424,6 @@ String RID_DESKTOP QueryBox RID_XMLSEC_QUERY_LOSINGSIGNATURE { -// HelpId = HID_XMLSEC_QUERY_LOSINGSIGNATURE; Buttons = WB_YES_NO ; DefButton = WB_DEF_NO ; Message [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ; @@ -443,7 +431,6 @@ QueryBox RID_XMLSEC_QUERY_LOSINGSIGNATURE QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN { -// HelpId = HID_XMLSEC_QUERY_SAVEBEFORESIGN; Buttons = WB_YES_NO ; DefButton = WB_DEF_YES ; Message [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ; @@ -451,7 +438,6 @@ QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT { -// HelpId = HID_XMLSEC_INFO_WRONGDOCFORMAT; Message [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ; }; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index fe682c3e30e4..d718166878cc 100755 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -267,7 +267,6 @@ bool SfxApplication::Initialize_Impl() // diverse Pointer SfxPickList::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) ); - ///////////////////////////////////////////////////////////////// DBG_ASSERT( !pAppData_Impl->pAppDispat, "AppDispatcher already exists" ); pAppData_Impl->pAppDispat = new SfxDispatcher((SfxDispatcher*)0); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index a90196ad9180..fe56ba2c500b 100755 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -844,13 +844,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) delete pURLList; } - if ( !rReq.IsSynchronCall() ) - { - // now check wether a stream is already there - // if not: download it in a thread and restart the call - // return; - } - sal_Bool bHyperlinkUsed = sal_False; if ( SID_OPENURL == nSID ) diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 993406e41399..b6b31cde6f30 100755 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -153,13 +153,6 @@ void SfxApplication::Deinitialize() //TODO/CLEANTUP //ReleaseArgs could be used instead! -/* This leak is intended ! - Otherwise the TestTool cant use .uno:QuitApp ... - because every destructed ItemSet work's on an already - released pool pointer .-) - - NoChaos::ReleaseItemPool(); -*/ pAppData_Impl->pPool = NULL; } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 252b3f6ab8e2..193834d44ed5 100755 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2170,7 +2170,6 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( //============================================================================= // Add new macro line to handle new service. - // // !!! ATTENTION !!! // Write no ";" at end of line and dont forget "else" ! (see macro) //============================================================================= diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 3473514de3fc..3ce4d0ee5a00 100755 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -388,7 +388,6 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin String aWinData( aTmp ); rInfo.aWinState = ByteString( String(aWinOpt.GetWindowState()), RTL_TEXTENCODING_UTF8 ); - //ImplWindowStateFromStr( rInfo.aPos, rInfo.aSize, ByteString( aWinState, RTL_TEXTENCODING_UTF8 ) ); if ( aWinData.Len() ) { diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index b16b673136ec..a3eb43bd6f9b 100755 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -351,7 +351,6 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) if( !pDownLoadData->aGrf.GetContext() ) { xMed->SetDataAvailableLink( Link() ); -// xMed->SetDoneLink( Link() ); delete pDownLoadData, pDownLoadData = 0; bDataReady = sal_True; bWaitForData = sal_False; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 410640750ec3..9829c3bed5ce 100755 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -510,8 +510,6 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId() if( !nFormat ) { -// what is the new interface? -// nFormat = Exchange::RegisterFormatName( "StatusInfo vom SvxInternalLink" ); nFormat = SotExchange::RegisterFormatName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StatusInfo from SvxInternalLink" ))); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 605b674e23ab..1aa2e8ad6230 100755 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1551,7 +1551,6 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo if (xContent.is()) { bSuccess = sal_True; -// break; } } catch(const RuntimeException&) diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx index 9a3ab850ae36..56932fff80a6 100755 --- a/sfx2/source/appl/shutdowniconOs2.cxx +++ b/sfx2/source/appl/shutdowniconOs2.cxx @@ -46,9 +46,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::osl; -// // This ObjectID must match the one created in WarpIN scripts!! -// #define QUICKSTART_OBJID "OO2_QUICKSTART" bool ShutdownIcon::IsQuickstarterInstalled() diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 72bd91ae1727..6e734f523c19 100755 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -41,9 +41,7 @@ #undef WINVER #define WINVER 0x0400 #define USE_APP_SHORTCUTS -// // the systray icon is only available on windows -// #include <unotools/moduleoptions.hxx> #include <unotools/dynamicmenuoptions.hxx> @@ -739,7 +737,6 @@ void OnDrawItem(HWND /*hwnd*/, LPDRAWITEMSTRUCT lpdis) IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR | LR_SHARED ); - // DrawIconEx( lpdis->hDC, x, y+(height-cy)/2, hIcon, cx, cy, 0, NULL, DI_NORMAL ); HBRUSH hbrIcon = CreateSolidBrush( GetSysColor( COLOR_GRAYTEXT ) ); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 5036790bfe70..e61171a381f7 100755 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -991,7 +991,6 @@ SvBorder SfxWorkWindow::Arrange_Impl() //-------------------------------------------------------------------- // Close-Handler: The Configuration of the ChildWindows is saved. -// void SfxWorkWindow::Close_Impl() { diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index 6ebd346e4e5e..19c11b525dab 100755 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -70,9 +70,9 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT // Get and set the options Size aMargin( pFrame->GetMargin() ); - // MIB 07/15/1997: Netscape seems to set marginwidth to 0 as soon as - // marginheight is set, and vice versa. Due to bug #41665# let us also - // do like that for now. Netscape does however not allow for a direct + // Netscape seems to set marginwidth to 0 as soon as + // marginheight is set, and vice versa. + // Netscape does however not allow for a direct // seting to 0, while IE4.0 does // We will not mimic that bug ! sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False; diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index 219e41c5cd53..e98014cdba16 100755 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -45,9 +45,7 @@ SfxResId::SfxResId( sal_uInt16 nId ) : } //============================================================================ -// // SfxSimpleResId Implementation. -// //============================================================================ SfxSimpleResId::SfxSimpleResId(sal_uInt16 nID): diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 9d7c805e6fa9..5e685dfa4bfd 100755 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1420,9 +1420,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl else pRealSlot = pMsgSvr->GetSlot(); - // // Note: pCache can be NULL! - // pFnc = pRealSlot->GetStateFnc(); @@ -1462,7 +1460,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl // Does the slot have to be updated at all? bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty(); - // Bugfix #26161#: It is not enough to ask for the same shell!! + // It is not enough to ask for the same shell!! bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc; // If the slot is a non-dirty master slot, then maybe one of his slaves diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 331baf83480f..bd7c0a987546 100755 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -83,11 +83,6 @@ sal_Bool SfxControllerItem::IsBound() const return pNext != this; } -//-------------------------------------------------------------------- -// returns the associated function-id or 0 if none - -// sal_uInt16 SfxControllerItem::GetId() const; - //==================================================================== // registeres with the id at the bindings diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 64aac4862c52..f6acd615074d 100755 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2404,7 +2404,6 @@ sal_Bool SfxDispatcher::_FillState DBG_ASSERT(bFlushed, "Dispatcher not flushed after retrieving slot servers!"); if ( !bFlushed ) return sal_False; - // Flush(); // Determine the object and call the Message of this object SfxShell *pSh = GetShell(rSvr.GetShellLevel()); diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 5db7ffd1f1e9..cd60b7a2ec5b 100755 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -434,8 +434,6 @@ void SfxStateCache::SetState_Impl return; DBG_ASSERT( bMaybeDirty || !bSlotDirty, "setting state of dirty message" ); -// DBG_ASSERT( bCtrlDirty || ( aSlotServ.GetSlot() && aSlotServ.GetSlot()->IsMode(SFX_SLOT_VOLATILE) ), ! Discussed with MBA -// "setting state of non dirty controller" ); DBG_ASSERT( SfxControllerItem::GetItemState(pState) == eState, "invalid SfxItemState" ); DBG_PROFSTART(SfxStateCacheSetState); diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src index fdaa47543a2a..2e617bb0d16d 100755 --- a/sfx2/source/dialog/dinfdlg.src +++ b/sfx2/source/dialog/dinfdlg.src @@ -527,7 +527,6 @@ TabPage TP_CUSTOMPROPERTIES Size = MAP_APPFONT ( 248 , 141 ) ; Border = TRUE; DialogControl = TRUE; - //OutputSize = TRUE ; Window WIN_PROPERTIES { OutputSize = TRUE ; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index a2afa03773c6..a787013cf04f 100755 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1212,8 +1212,6 @@ void SfxDockingWindow::Initialize_Impl() // remember floating size for calculating alignment and tracking rectangle SetFloatingSize( pFloatWin->GetSizePixel() ); - // some versions of VCL didn't call resize in the current situation - //Resize(); } // allow calling of docking handlers diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index f90cb9116fe6..237699757a45 100755 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2754,8 +2754,6 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) } // ------------------------------------------------------------------------ -// ------------------------------------------------------------------------ -// ------------------------------------------------------------------------ ErrCode FileOpenDialog_Impl( sal_Int64 nFlags, const String& rFact, diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src index 01650f3e9275..394c0415880d 100755 --- a/sfx2/source/dialog/printopt.src +++ b/sfx2/source/dialog/printopt.src @@ -33,9 +33,7 @@ #include "helpid.hrc" //**************************************************************************** -// // TabPage -// //**************************************************************************** TabPage TP_COMMONPRINTOPTIONS diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 535a74625fc3..039e22be91e4 100755 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////// namespace @@ -103,7 +102,6 @@ namespace } } -////////////////////////////////////////////////////////////////////// static short lcl_GetPassword( Window *pParent, @@ -143,7 +141,6 @@ static bool lcl_IsPasswordCorrect( const String &rPassword ) return bRes; } -////////////////////////////////////////////////////////////////////// struct SfxSecurityPage_Impl { @@ -483,7 +480,6 @@ IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////// SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet & rItemSet ) { @@ -522,6 +518,5 @@ void SfxSecurityPage::Reset( const SfxItemSet & rItemSet ) m_pImpl->Reset_Impl( rItemSet ); } -////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 325b512ce8b7..0386b48542fc 100755 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -601,7 +601,6 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl( } //------------------------------------------------------------------------- -//------------------------------------------------------------------------- class StyleTreeArr_Impl; @@ -1782,7 +1781,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox ) { DELETEZ(pTreeBox); aFmtLb.Show(); - // aFilterLb.Enable(); // If bHierarchical, then the family can have changed // minus one since hierarchical is inserted at the start FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical ); diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index 51b6e9802147..7075d1963757 100755 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -158,7 +158,6 @@ DockingWindow DLG_STYLE_DESIGNER Sizeable = TRUE ; Dockable = TRUE ; EnableResizing = TRUE ; - // HideWhenDeactivate = TRUE; Border = TRUE ; Moveable = TRUE ; ToolBox TB_ACTION diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src index 927c940e6506..a86de72fec81 100755 --- a/sfx2/source/dialog/versdlg.src +++ b/sfx2/source/dialog/versdlg.src @@ -33,7 +33,6 @@ ModalDialog DLG_VERSIONS Size = MAP_APPFONT ( 340 , 184 ) ; SvLook = TRUE ; Moveable = TRUE ; -//! Closeable = TRUE ; FixedLine GB_NEWVERSIONS { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 3e54717ca6d2..6d6f251f8df6 100755 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -98,7 +98,6 @@ bool isValidNCName(::rtl::OUString const & i_rIdref) reinterpret_cast<const unsigned char*>(id.getStr()), 0)); } -//////////////////////////////////////////////////////////////////////////// static const char s_content [] = "content.xml"; static const char s_styles [] = "styles.xml"; @@ -108,7 +107,6 @@ static const char s_manifest[] = "manifest.rdf"; static const char s_rdfxml [] = "application/rdf+xml"; static const char s_odfmime [] = "application/vnd.oasis.opendocument."; -//////////////////////////////////////////////////////////////////////////// static bool isContentFile(::rtl::OUString const & i_rPath) { @@ -128,7 +126,6 @@ static bool isReservedFile(::rtl::OUString const & i_rPath) || i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_settings)); } -//////////////////////////////////////////////////////////////////////////// uno::Reference<rdf::XURI> createBaseURI( uno::Reference<uno::XComponentContext> const & i_xContext, @@ -206,7 +203,6 @@ uno::Reference<rdf::XURI> createBaseURI( return rdf::URI::create(i_xContext, xBaseURI->getUriReference()); } -//////////////////////////////////////////////////////////////////////////// struct DocumentMetadataAccess_Impl { @@ -293,7 +289,6 @@ splitXmlId(::rtl::OUString const & i_XmlId, } } -//////////////////////////////////////////////////////////////////////////// static uno::Reference<rdf::XURI> getURIForStream(struct DocumentMetadataAccess_Impl& i_rImpl, @@ -440,7 +435,6 @@ isPartOfType(struct DocumentMetadataAccess_Impl & i_rImpl, } } -//////////////////////////////////////////////////////////////////////////// static ucb::InteractiveAugmentedIOException mkException( ::rtl::OUString const & i_rMessage, @@ -800,7 +794,6 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) } -//////////////////////////////////////////////////////////////////////////// DocumentMetadataAccess::DocumentMetadataAccess( uno::Reference< uno::XComponentContext > const & i_xContext, diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 82e6afe883f5..b2af198fc505 100755 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -415,7 +415,6 @@ public: return comp_CompatWriterDocProps::_getSupportedServiceNames(); } }; -//////////////////////////////////////////////////////////////////////////// bool operator== (const css::util::DateTime &i_rLeft, const css::util::DateTime &i_rRight) @@ -800,7 +799,6 @@ SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name, SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const // throw (css::uno::RuntimeException) { -// checkInit(); ::rtl::OUString name = ::rtl::OUString::createFromAscii(i_name); DBG_ASSERT(m_meta.find(name) != m_meta.end(), "SfxDocumentMetaData::getMetaAttr: not found"); @@ -1392,7 +1390,6 @@ void SAL_CALL SfxDocumentMetaData::init( } -//////////////////////////////////////////////////////////////////////////// SfxDocumentMetaData::SfxDocumentMetaData( css::uno::Reference< css::uno::XComponentContext > const & context) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index b7dfff9da835..03897b24531a 100755 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -2012,7 +2012,6 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, INetURLObject aSourceObj( rSourceURL ); if ( rTemplateName.equals( aTitle ) ) { - ///////////////////////////////////////////////////// // addTemplate will sometimes be called just to add an entry in the // hierarchy; the target URL and the source URL will be the same in // this scenario @@ -2031,7 +2030,6 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, return addEntry( aGroup, rTemplateName, aTargetURL2, aType ); } - ///////////////////////////////////////////////////// // copy the template into the new group (targeturl) INetURLObject aTmpURL( aSourceObj ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index b2f6dc7c4a7d..f6d3fb221b0a 100755 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1765,7 +1765,6 @@ sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame:: return aDlg.Execute() == RET_OK; } -// static void SfxStoringHelper::ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper ,const ::rtl::OUString& _sFilterName ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel @@ -1776,7 +1775,6 @@ void SfxStoringHelper::ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper _rArgsSequence = aModelData.GetMediaDescr().getAsConstPropertyValueList(); } -// static Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel ) { Window* pWin = 0; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index cae0fb743e40..38f9b7a08f84 100755 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -499,7 +499,6 @@ sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource, SfxStyleFamily eOldFamily = pHisSheet->GetFamily(); SfxStyleSheetBase* pExist = pMyPool->Find(aOldName, eOldFamily); - // sal_uInt16 nOldHelpId = pExist->GetHelpId(???); sal_Bool bUsedOrUserDefined; if( pExist ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 34a102eb78c3..fc4c9c0556a8 100755 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -829,7 +829,6 @@ String X(const String &rRet) #endif //-------------------------------------------------------------------- -//-------------------------------------------------------------------- String SfxObjectShell::GetTitle ( sal_uInt16 nMaxLength /* 0 (default) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 589dacc54970..5baeca27a012 100755 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1466,7 +1466,6 @@ void SfxObjectShell::SignScriptingContent() ImplSign( sal_True ); } -// static const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index f7bc738cd986..d570e0b3e028 100755 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2821,7 +2821,6 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // all values present in both itemsets will be overwritten by the new parameters if( pParams ) pMergedParams->Put( *pParams ); - //DELETEZ( pParams ); #ifdef DBG_UTIL if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SFX_ITEM_SET ) diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index d4abac5bac7e..7e441a7e8909 100755 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -399,6 +399,5 @@ private: SfxOleSectionMap maSectionMap; }; -//}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index fc2bcd1b59d9..6b255678f014 100755 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -38,9 +38,7 @@ #define WID_CHAOS_START 500 //========================================================================= -// // class CntStaticPoolDefaults_Impl -// //========================================================================= class CntItemPool; @@ -103,9 +101,7 @@ sal_uInt16 NoChaos::ReleaseItemPool() } //========================================================================= -// // CntItemPool implementation -// //========================================================================= static CntStaticPoolDefaults_Impl* pPoolDefs_Impl = NULL; @@ -175,9 +171,7 @@ sal_uInt16 CntItemPool::Release() } //========================================================================= -// // CntStaticPoolDefaults_Impl implementation. -// //========================================================================= inline void CntStaticPoolDefaults_Impl::Insert( diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 3a996b73fa82..4ac20e430dd3 100755 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -131,14 +131,6 @@ public: //-------------------------------------------------------------------- -// checks wheather this function is in the stack of active SfxObjectInterface - -//inline sal_Bool SfxStateCache::IsCallable( SfxDispatcher &rDispat ) -//{ -// return GetSlotServer(rDispat) != 0; -//} -//-------------------------------------------------------------------- - // clears Cached-Item inline void SfxStateCache::ClearCache() diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 1eea340f26a9..3d3270d51a37 100755 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -109,7 +109,6 @@ public: SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const; String GetItemText( sal_uInt16 nId ) const; - //void InvalidateKeyCodes(); SfxVirtualMenu* GetParentMenu() const { return pParent; } void SetParentMenu( SfxVirtualMenu* pNewParent ) @@ -138,7 +137,6 @@ inline sal_uInt16 SfxVirtualMenu::GetItemCount() const } //-------------------------------------------------------------------- -// inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const { diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx index b7a857c6fbde..7c40d6f0b190 100755 --- a/sfx2/source/layout/sfxtabpage.cxx +++ b/sfx2/source/layout/sfxtabpage.cxx @@ -55,7 +55,6 @@ SfxTabPage::SfxTabPage (::Window *parent, char const* xml_file, char const* id, void SfxTabPage::FreeResource () { - //::Window::FreeResource (); } Size SfxTabPage::GetOptimalSize (WindowSizeType) const diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index 00eeed73f8f0..c6c2eb8bc056 100755 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -57,7 +57,6 @@ using ::rtl::OUString; SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem); -//////////////////////////////////////////////////////////// /* @@ -116,7 +115,6 @@ PopupMenu* SfxThesSubMenuControl::GetPopup() const } -//////////////////////////////////////////////////////////// OUString SfxThesSubMenuHelper::GetText( const String &rLookUpString, @@ -234,7 +232,6 @@ String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) cons return aRes; } -//////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 49169d7b1c2d..8ec3977f318b 100755 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -42,8 +42,6 @@ class Menu; namespace css = ::com::sun::star; -//////////////////////////////////////////////////////////// - class SfxThesSubMenuControl : public SfxMenuControl { PopupMenu* pMenu; @@ -62,7 +60,6 @@ public: SFX_DECL_MENU_CONTROL(); }; -//////////////////////////////////////////////////////////// class SfxThesSubMenuHelper { @@ -93,7 +90,6 @@ public: String GetThesImplName( const css::lang::Locale &rLocale ) const; }; -//////////////////////////////////////////////////////////// #endif diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 721500abd329..da576c4d316e 100755 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -979,7 +979,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( bControllersUnBound ) BindControllers(); - //InvalidateKeyCodes(); pBindings->GetDispatcher_Impl()->Flush(); for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos ) { @@ -1179,7 +1178,6 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText ) //-------------------------------------------------------------------- -// void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) { diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index b5bf27c86b3b..630bff153351 100755 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -278,10 +278,6 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg if ( xDisp.is() ) { - //::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); - //aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); - //aArs[0].Value <<= ::rtl::OUString( pDoc->GetMedium()->GetName() ); - //xDisp->dispatch( aURL, aArgs ); css::beans::PropertyValue aEventParam; aEventParam.Value <<= aTrigger; @@ -346,7 +342,6 @@ void SAL_CALL SfxEvents_Impl::disposing( const EVENTOBJECT& /*Source*/ ) throw( } //-------------------------------------------------------------------------------------------------------- -// //-------------------------------------------------------------------------------------------------------- SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, REFERENCE< XEVENTBROADCASTER > xBroadcaster ) @@ -478,10 +473,6 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i OUSTRING aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); if (aBasMgrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) aLibrary = pDoc->GetTitle(); -/* - else if ( aBasMgrName.getLength() ) - aLibrary = aBasMgrName; - */ else aLibrary = SFX_APP()->GetName(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 344bb3a7bc43..da3042599ae7 100755 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -299,7 +299,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime // sub toolbar while we get disposed. Therefore we have to dispose // it now! Not doing so would result in a crash. The sub toolbar // gets destroyed asynchronously and would access a non-existing - // parent toolbar! See #126569# + // parent toolbar! if ( pImpl->mxUIElement.is() ) { Reference< XComponent > xComponent( pImpl->mxUIElement, UNO_QUERY ); @@ -1855,16 +1855,6 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxAppToolBoxControl_Impl, ExecuteHdl_Impl, Execute // Framework can recycle our current frame and the layout manager disposes all user interface // elements if a component gets detached from its frame! pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); -/* -} - catch (const ::com::sun::star::document::CorruptedFilterConfigurationException& exFilters) - { - throw exFilters; - } - catch (const Exception& ) - { - } -*/ delete pExecuteInfo; return 0; } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 42ab08eed43a..938165549bf4 100755 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -625,7 +625,6 @@ SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const ::com::sun::star::uno:: int SfxUsrAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const { -// return rItem.ISA( SfxUsrAnyItem ) && ((SfxUsrAnyItem&)rItem).aValue == aValue; return sal_False; } diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 72843c57789e..924d2bd7e557 100755 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -155,7 +155,6 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) } else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { - //EnableInput( sal_True, sal_True ); pView->SetModalMode( sal_False ); return sal_True; } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 0fa6c1d54e18..689c71df9f04 100755 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -199,19 +199,6 @@ throw (::com::sun::star::uno::RuntimeException) } else if ( m_pClient && nNewState == embed::EmbedStates::UI_ACTIVE ) { -/* - uno::Reference < lang::XUnoTunnel > xObj( m_xObject->getComponent(), uno::UNO_QUERY ); - uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() ); - sal_Int64 nHandle = xObj.is() ? xObj->getSomething( aSeq ) : 0; - if ( nHandle ) - { - // currently needs SFX code - SfxObjectShell* pDoc = reinterpret_cast< SfxObjectShell* >( sal::static_int_cast< sal_IntPtr >( nHandle )); - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDoc ); - SfxWorkWindow *pWorkWin = pFrame->GetFrame().GetWorkWindow_Impl(); - pWorkWin->UpdateObjectBars_Impl(); - } -*/ } } diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index c923135dbdc4..2ed26e48cde3 100755 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -171,7 +171,6 @@ sal_Bool _FileListEntry::DeleteObjectShell() { } -// aDocShell->SfxObjectShell::DoSaveCompleted(); } } else @@ -673,7 +672,6 @@ sal_Bool SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller, sal_True, nIdx); pCaller->Update(); - // pCaller->EditEntry( pEntry ); pCaller->Expand( pParent ); bModified = sal_True; return sal_True; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 1b49688489be..58f1cfa64676 100755 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -365,7 +365,6 @@ void SAL_CALL SfxStatusIndicator::disposing( const com::sun::star::lang::EventOb } //________________________________________________________________________________________________________ -//________________________________________________________________________________________________________ // declaration IMPL_SfxBaseController_ListenerHelper //________________________________________________________________________________________________________ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3f69502c9983..e24d6a8e542d 100755 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -450,8 +450,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; } - // Evaluate Parameter - // sal_Bool bReload = sal_True; if ( rReq.IsAPI() ) { // Control through API if r/w or r/o @@ -564,8 +562,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_True ) ); rReq.Done( sal_True ); - // if( nOpenMode == SFX_STREAM_READONLY ) - // pMed->Close(); return; } } @@ -694,8 +690,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( xOldObj->IsDocShared() ) pNewSet->Put( SfxStringItem( SID_FILE_NAME, xOldObj->GetSharedFileURL() ) ); - //pNewMedium = new SfxMedium( aURL, nMode, pMedium->IsDirect(), bUseFilter ? pMedium->GetFilter() : 0, pNewSet ); - //pNewSet = pNewMedium->GetItemSet(); if ( pURLItem ) pNewSet->Put( SfxStringItem( SID_REFERER, pMedium->GetName() ) ); else @@ -703,8 +697,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) xOldObj->CancelTransfers(); - // Real Reload - //pNewSet->Put( SfxFrameItem ( SID_DOCFRAME, GetFrame() ) ); if ( pSilentItem && pSilentItem->GetValue() ) pNewSet->Put( SfxBoolItem( SID_SILENT, sal_True ) ); @@ -796,12 +788,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet ); } } - else - { - // an error handling should be done here?! - // if ( !pSilentItem || !pSilentItem->GetValue() ) - // ErrorHandler::HandleError( nLoadError ); - } } else { @@ -1395,7 +1381,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // via API from another thread (Java). // According to MBA this call is not necessary anymore, // because each document has its own SfxBindings. - // //GetDispatcher()->GetBindings()->InvalidateAll(sal_True); } @@ -1970,7 +1955,7 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame ) if ( pViewFrame ) xActive = pViewFrame->GetFrame().GetFrameInterface(); - if ( xFrame.is() ) // PB: #74432# xFrame can be NULL + if ( xFrame.is() ) // xFrame can be NULL xFrame->setActiveFrame( xActive ); } } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index b43051b22d45..57c64187a839 100755 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -192,9 +192,6 @@ String SfxViewFrame::UpdateTitle() if ( !pObjSh ) return String(); -// if ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) -// // No UpdateTitle with Embedded-ObjectShell -// return String(); const SfxMedium *pMedium = pObjSh->GetMedium(); String aURL; @@ -260,11 +257,6 @@ String SfxViewFrame::UpdateTitle() GetBindings().Invalidate( SID_NEWDOCDIRECT ); - /* AS_TITLE - Window* pWindow = GetFrame()->GetTopWindow_Impl(); - if ( pWindow && pWindow->GetText() != aTitle ) - pWindow->SetText( aTitle ); - */ return aTitle; } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 3974e8aeeb81..877005eb908c 100755 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -533,8 +533,6 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) // or the other way around? if ( (aTempPrtName != aDocPrtName) || (pDocPrinter->IsDefPrinter() != pNewPrinter->IsDefPrinter()) ) { - // Get the new printer - // pNewPrinter->SetOrigJobSetup( pNewPrinter->GetJobSetup() ); nChangedFlags |= SFX_PRINTER_PRINTER|SFX_PRINTER_JOBSETUP; pDocPrinter = pNewPrinter; } @@ -553,8 +551,6 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) JobSetup aOldJobSetup = pDocPrinter->GetJobSetup(); if ( aNewJobSetup != aOldJobSetup ) { - // JobSetup has chaged => App must be formatted again) - // pDocPrinter->SetOrigJobSetup( aNewJobSetup ); nChangedFlags |= SFX_PRINTER_JOBSETUP; } @@ -639,9 +635,7 @@ Printer* SfxViewShell::GetActivePrinter() const void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) { - // sal_uInt16 nCopies=1; sal_uInt16 nDialogRet = RET_CANCEL; - // sal_Bool bCollate=sal_False; SfxPrinter* pPrinter = 0; SfxDialogExecutor_Impl* pExecutor = 0; bool bSilent = false; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index f1a9126bb037..eb5f98905cbb 100755 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -90,7 +90,6 @@ #include <sfx2/objface.hxx> #include <sfx2/docfilt.hxx> -// #110897# #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; @@ -881,13 +880,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) } bEnabled = !pPrinter || !pPrinter->IsPrinting(); } - if ( !bEnabled ) - { - // will now be handled by requeing the request - /* rSet.DisableItem( SID_PRINTDOC ); - rSet.DisableItem( SID_PRINTDOCDIRECT ); - rSet.DisableItem( SID_SETUPPRINTER ); */ - } break; } @@ -909,21 +901,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) !pImp->m_bPlugInsActive) ); break; } - /* - // SelectionText - case SID_SELECTION_TEXT: - { - rSet.Put( SfxStringItem( SID_SELECTION_TEXT, GetSelectionText() ) ); - break; - } - - // SelectionTextExt - case SID_SELECTION_TEXT_EXT: - { - rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(sal_True) ) ); - break; - } - */ case SID_STYLE_FAMILY : { rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->m_nFamily ) ); @@ -1004,10 +981,6 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) pFrame->GetDispatcher()->Update_Impl( sal_True ); pFrame->GetBindings().HidePopups(sal_False); - // uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() ); - // uno::Reference < frame::XFramesSupplier > xParentFrame( xOwnFrame->getCreator(), uno::UNO_QUERY ); - // if ( xParentFrame.is() ) - // xParentFrame->setActiveFrame( uno::Reference < frame::XFrame >() ); } //-------------------------------------------------------------------- @@ -1256,7 +1229,6 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) DBG_CHKTHIS(SfxViewShell, 0); DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); - //if ( rBorder != GetBorderPixel()) { GetViewFrame()->SetBorderPixelImpl( this, rBorder ); @@ -1347,8 +1319,6 @@ SfxViewShell::SfxViewShell { DBG_CTOR(SfxViewShell, 0); - //pImp->pPrinterCommandQueue = new SfxAsyncPrintExec_Impl( this ); - if ( pViewFrame->GetParentViewFrame() ) { pImp->m_bPlugInsActive = pViewFrame->GetParentViewFrame() @@ -1388,7 +1358,6 @@ SfxViewShell::~SfxViewShell() pImp->m_pController.clear(); } - //DELETEZ( pImp->pPrinterCommandQueue ); DELETEZ( pImp ); DELETEZ( pIPClientList ); } @@ -2143,8 +2112,6 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUStr sal_Bool bModified = sal_False; // create container from menu - // #110897# - // aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( &rIn ); aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( ::comphelper::getProcessServiceFactory(), &rIn, &rMenuIdentifier ); @@ -2275,7 +2242,6 @@ sal_Bool SfxViewShell::HasMouseClickListeners_Impl() void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts ) { pImp->aPrintOpts = rOpts; -// GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) ); } sal_Bool SfxViewShell::Escape() |